Skip to content

Commit

Permalink
fixes nim-lang#892
Browse files Browse the repository at this point in the history
  • Loading branch information
Araq committed Feb 14, 2014
1 parent a5efe84 commit 896c961
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
1 change: 1 addition & 0 deletions compiler/lookups.nim
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ proc considerAcc*(n: PNode): PIdent =
of nkSym: id.add(x.sym.name.s)
else: globalError(n.info, errIdentifierExpected, renderTree(n))
result = getIdent(id)
of nkOpenSymChoice, nkClosedSymChoice: result = n.sons[0].sym.name
else:
globalError(n.info, errIdentifierExpected, renderTree(n))

Expand Down
8 changes: 4 additions & 4 deletions examples/htmltitle.nim
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

import os, streams, parsexml, strutils

if paramCount() < 1:
if paramCount() < 1:
quit("Usage: htmltitle filename[.html]")

var filename = addFileExt(ParamStr(1), "html")
var filename = addFileExt(paramStr(1), "html")
var s = newFileStream(filename, fmRead)
if s == nil: quit("cannot open the file " & filename)
var x: TXmlParser
Expand All @@ -23,13 +23,13 @@ while true:
title.add(x.charData)
x.next()
if x.kind == xmlElementEnd and cmpIgnoreCase(x.elementName, "title") == 0:
Echo("Title: " & title)
echo("Title: " & title)
quit(0) # Success!
else:
echo(x.errorMsgExpected("/title"))

of xmlEof: break # end of file reached
else: nil # ignore other events
else: discard # ignore other events

x.close()
quit("Could not determine title!")
Expand Down
3 changes: 2 additions & 1 deletion koch.nim
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ proc install(args: string) =

proc web(args: string) =
exec(("$# cc -r tools/nimweb.nim web/nimrod --putenv:nimrodversion=$#" &
" --path:$#") % [findNim(), NimrodVersion, getCurrentDir()])
" --path:$#") % [findNim(), NimrodVersion,
getCurrentDir().quoteIfContainsWhite])

# -------------- boot ---------------------------------------------------------

Expand Down
13 changes: 13 additions & 0 deletions tests/template/ttempl5.nim
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,16 @@ import mtempl5

echo templ()

#bug #892

proc parse_to_close(value: string, index: int, open='(', close=')'): int =
discard

# Call parse_to_close
template get_next_ident: stmt =
discard "{something}".parse_to_close(0, open = '{', close = '}')

get_next_ident()


#identifier expected, but found '(open|open|open)'

0 comments on commit 896c961

Please sign in to comment.