jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #7129

Browse source
This commit is contained in:
Andreas Rumpf 2018-01-30 19:51:38 +01:00
commit a605fa8ba6
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/cgen.nim
View file

@ -908,7 +908,6 @@ proc addIntTypes(result: var Rope) {.inline.} =
platform.CPU[targetCPU].intSize.rope]) platform.CPU[targetCPU].intSize.rope])
proc getCopyright(cfile: Cfile): Rope = proc getCopyright(cfile: Cfile): Rope =
const copyrightYear = "2017"
if optCompileOnly in gGlobalOptions: if optCompileOnly in gGlobalOptions:
result = ("/* Generated by Nim Compiler v$1 */$N" & result = ("/* Generated by Nim Compiler v$1 */$N" &
"/* (c) " & copyrightYear & " Andreas Rumpf */$N" & "/* (c) " & copyrightYear & " Andreas Rumpf */$N" &

2
compiler/commands.nim
View file

@ -54,7 +54,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
const const
HelpMessage = "Nim Compiler Version $1 [$2: $3]\n" & HelpMessage = "Nim Compiler Version $1 [$2: $3]\n" &
"Copyright (c) 2006-2017 by Andreas Rumpf\n" "Copyright (c) 2006-" & copyrightYear & " by Andreas Rumpf\n"
const const
Usage = slurp"../doc/basicopt.txt".replace("//", "") Usage = slurp"../doc/basicopt.txt".replace("//", "")

6
compiler/jsgen.nim
View file

@ -2390,7 +2390,7 @@ proc genHeader(target: TTarget): Rope =
if target == targetJS: if target == targetJS:
result = ( result = (
"/* Generated by the Nim Compiler v$1 */$n" & "/* Generated by the Nim Compiler v$1 */$n" &
"/* (c) 2017 Andreas Rumpf */$n$n" & "/* (c) " & copyrightYear & " Andreas Rumpf */$n$n" &
"var framePtr = null;$n" & "var framePtr = null;$n" &
"var excHandler = 0;$n" & "var excHandler = 0;$n" &
"var lastJSError = null;$n" & "var lastJSError = null;$n" &
@ -2406,7 +2406,7 @@ proc genHeader(target: TTarget): Rope =
else: else:
result = ("<?php$n" & result = ("<?php$n" &
"/* Generated by the Nim Compiler v$1 */$n" & "/* Generated by the Nim Compiler v$1 */$n" &
"/* (c) 2017 Andreas Rumpf */$n$n" & "/* (c) " & copyrightYear & " Andreas Rumpf */$n$n" &
"$$framePtr = null;$n" & "$$framePtr = null;$n" &
"$$excHandler = 0;$n" & "$$excHandler = 0;$n" &
"$$lastJSError = null;$n") % "$$lastJSError = null;$n") %
@ -2464,7 +2464,7 @@ proc genClass(obj: PType; content: Rope; ext: string) =
else: nil else: nil
let result = ("<?php$n" & let result = ("<?php$n" &
"/* Generated by the Nim Compiler v$# */$n" & "/* Generated by the Nim Compiler v$# */$n" &
"/* (c) 2017 Andreas Rumpf */$n$n" & "/* (c) " & copyrightYear & " Andreas Rumpf */$n$n" &
"require_once \"nimsystem.php\";$n" & "require_once \"nimsystem.php\";$n" &
"class $#$# {$n$#$n}$n") % "class $#$# {$n$#$n}$n") %
[rope(VersionAsString), cls, extends, content] [rope(VersionAsString), cls, extends, content]

1
compiler/options.nim
View file

@ -18,6 +18,7 @@ const
newScopeForIf* = true newScopeForIf* = true
useCaas* = not defined(noCaas) useCaas* = not defined(noCaas)
noTimeMachine* = defined(avoidTimeMachine) and defined(macosx) noTimeMachine* = defined(avoidTimeMachine) and defined(macosx)
copyrightYear* = "2018"
type # please make sure we have under 32 options type # please make sure we have under 32 options
# (improves code efficiency a lot!) # (improves code efficiency a lot!)