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

Merge branch 'master' of git@github.com:Araq/Nimrod

Browse source
This commit is contained in:
Araq 2011-07-30 10:43:05 +02:00
commit 086f0d34db
3 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/c2nim/c2nim.nim
View file

@ -61,10 +61,10 @@ for kind, key, val in getopt():
of "version", "v": of "version", "v":
stdout.write(Version & "\n") stdout.write(Version & "\n")
quit(0) quit(0)
of "o", "out": outfile = key of "o", "out": outfile = val
else: else:
if not parserOptions.setOption(key, val): if not parserOptions.setOption(key, val):
stdout.write("[Error] unknown option: " & key) stdout.writeln("[Error] unknown option: " & key)
of cmdEnd: assert(false) of cmdEnd: assert(false)
if infile.len == 0: if infile.len == 0:
# no filename has been given, so we show the help: # no filename has been given, so we show the help:

4
compiler/pas2nim/pas2nim.nim
View file

@ -49,10 +49,10 @@ for kind, key, val in getopt():
of "version", "v": of "version", "v":
stdout.write(Version & "\n") stdout.write(Version & "\n")
quit(0) quit(0)
of "o", "out": outfile = key of "o", "out": outfile = val
of "ref": incl(flags, pfRefs) of "ref": incl(flags, pfRefs)
of "boot": flags = flags + {pfRefs, pfMoreReplacements, pfImportBlackList} of "boot": flags = flags + {pfRefs, pfMoreReplacements, pfImportBlackList}
else: stdout.write("[Error] unknown option: " & key) else: stdout.writeln("[Error] unknown option: " & key)
of cmdEnd: assert(false) of cmdEnd: assert(false)
if infile.len == 0: if infile.len == 0:
# no filename has been given, so we show the help: # no filename has been given, so we show the help:

6
tests/tester.nim
View file

@ -11,7 +11,7 @@
import import
parseutils, strutils, pegs, os, osproc, streams, parsecfg, browsers, json, parseutils, strutils, pegs, os, osproc, streams, parsecfg, browsers, json,
marshal marshal, cgi
const const
cmdTemplate = r"nimrod cc --hints:on $# $#" cmdTemplate = r"nimrod cc --hints:on $# $#"
@ -170,12 +170,12 @@ const
proc addResult(r: var TResults, test, expected, given: string, proc addResult(r: var TResults, test, expected, given: string,
success: TResultEnum) = success: TResultEnum) =
r.data.addf("<tr><td>$#</td><td>$#</td><td>$#</td><td>$#</td></tr>\n", [ r.data.addf("<tr><td>$#</td><td>$#</td><td>$#</td><td>$#</td></tr>\n", [
test, expected, given, success.colorResult]) XMLEncode(test), XMLEncode(expected), XMLEncode(given), success.colorResult])
proc addResult(r: var TResults, test, given: string, proc addResult(r: var TResults, test, given: string,
success: TResultEnum) = success: TResultEnum) =
r.data.addf("<tr><td>$#</td><td>$#</td><td>$#</td></tr>\n", [ r.data.addf("<tr><td>$#</td><td>$#</td><td>$#</td></tr>\n", [
test, given, success.colorResult]) XMLEncode(test), XMLEncode(given), success.colorResult])
proc listResults(reject, compile, run: TResults) = proc listResults(reject, compile, run: TResults) =
var s = "<html>" var s = "<html>"