diff options
| -rwxr-xr-x | lib/system.nim | 6 | ||||
| -rwxr-xr-x | rod/ptmplsyn.nim | 60 | ||||
| -rwxr-xr-x | tools/buildsh.tmpl | 6 |
3 files changed, 56 insertions, 16 deletions
diff --git a/lib/system.nim b/lib/system.nim index 0b2959266..9eabeb2af 100755 --- a/lib/system.nim +++ b/lib/system.nim @@ -720,7 +720,7 @@ const proc compileOption*(option: string): bool {. magic: "CompileOption", noSideEffect.} - ## can be used to determine a on|off compile-time option. Example: + ## can be used to determine an on|off compile-time option. Example: ## ## .. code-block:: nimrod ## when compileOption("floatchecks"): @@ -735,7 +735,9 @@ proc compileOption*(option, arg: string): bool {. ## echo "compiled with optimization for size and uses Boehm's GC" include "system/inclrtl" -include "system/cgprocs" + +when not defined(ecmascript): + include "system/cgprocs" proc add *[T](x: var seq[T], y: T) {.magic: "AppendSeqElem", noSideEffect.} proc add *[T](x: var seq[T], y: openArray[T]) {.noSideEffect.} = diff --git a/rod/ptmplsyn.nim b/rod/ptmplsyn.nim index ad3a73b70..24cce2f0e 100755 --- a/rod/ptmplsyn.nim +++ b/rod/ptmplsyn.nim @@ -1,7 +1,7 @@ # # # The Nimrod Compiler -# (c) Copyright 2009 Andreas Rumpf +# (c) Copyright 2010 Andreas Rumpf # # See the file "copying.txt", included in this # distribution, for details about the copyright. @@ -21,23 +21,52 @@ type TParseState = enum psDirective, psTempl TTmplParser{.final.} = object - inp*: PLLStream - state*: TParseState - info*: TLineInfo - indent*, par*: int - x*: string # the current input line - outp*: PLLStream # the ouput will be parsed by pnimsyn - subsChar*, NimDirective*: Char - emit*, conc*, toStr*: string + inp: PLLStream + state: TParseState + info: TLineInfo + indent, emitPar: int + x: string # the current input line + outp: PLLStream # the ouput will be parsed by pnimsyn + subsChar, NimDirective: Char + emit, conc, toStr: string + curly, bracket, par: int + pendingExprLine: bool const PatternChars = {'a'..'z', 'A'..'Z', '0'..'9', '\x80'..'\xFF', '.', '_'} proc newLine(p: var TTmplParser) = - LLStreamWrite(p.outp, repeatChar(p.par, ')')) - p.par = 0 + LLStreamWrite(p.outp, repeatChar(p.emitPar, ')')) + p.emitPar = 0 if p.info.line > int16(1): LLStreamWrite(p.outp, "\n") + if p.pendingExprLine: + LLStreamWrite(p.outp, repeatChar(2)) + p.pendingExprLine = false + +proc scanPar(p: var TTmplParser, d: int) = + var i = d + while true: + case p.x[i] + of '\0': break + of '(': inc(p.par) + of ')': dec(p.par) + of '[': inc(p.bracket) + of ']': dec(p.bracket) + of '{': inc(p.curly) + of '}': dec(p.curly) + else: nil + inc(i) + +proc endsWithOpr(p: TTmplParser): bool = + var i = p.x.len-1 + while i >= 0 and p.x[i] == ' ': dec(i) + if i >= 0 and p.x[i] in {'+', '-', '*', '/', '\\', '<', '>', '!', '?', '^', + '|', '%', '&', '$', '@', '~', ','}: + result = true + +proc withInExpr(p: TTmplParser): bool {.inline.} = + result = p.par > 0 or p.bracket > 0 or p.curly > 0 proc parseLine(p: var TTmplParser) = var @@ -56,6 +85,9 @@ proc parseLine(p: var TTmplParser) = while p.x[j] in PatternChars: add(keyw, p.x[j]) inc(j) + + scanPar(p, j) + p.pendingExprLine = withInExpr(p) or endsWithOpr(p) case whichKeyword(keyw) of wEnd: if p.indent >= 2: @@ -79,6 +111,10 @@ proc parseLine(p: var TTmplParser) = p.state = psDirective else: # data line + # reset counters + p.par = 0 + p.curly = 0 + p.bracket = 0 j = 0 case p.state of psTempl: @@ -92,7 +128,7 @@ proc parseLine(p: var TTmplParser) = LLStreamWrite(p.outp, repeatChar(p.indent)) LLStreamWrite(p.outp, p.emit) LLStreamWrite(p.outp, "(\"") - inc(p.par) + inc(p.emitPar) p.state = psTempl while true: case p.x[j] diff --git a/tools/buildsh.tmpl b/tools/buildsh.tmpl index da034a76b..610420583 100755 --- a/tools/buildsh.tmpl +++ b/tools/buildsh.tmpl @@ -1,6 +1,8 @@ #! stdtmpl(subsChar='?') | standard #proc GenerateBuildShellScript(c: TConfigData): string = -# result = "#! /bin/sh\n# Generated by niminst\n" +# result = "#! /bin/sh\n# Generated from niminst\n" & +# "# Template is in tools/buildsh.tmpl\n" & +# "# To regenerate run ``niminst csource`` or ``koch csource``\n" CC="gcc" LINKER="gcc" COMP_FLAGS="-w -O3 -fno-strict-aliasing" @@ -33,7 +35,7 @@ case $uos in *darwin* ) myos="macosx" LINK_FLAGS="$LINK_FLAGS -ldl -lm" - if [ "`sysctl hw |grep 64bit`" = "hw.cpu64bit_capable: 1" ] ; then + if [ "$HOSTTYPE" = "x86_64" ] ; then ucpu="amd64" fi ;; |