From 37229df7fc044fe108d2f4d88f127141cabeb6a6 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 22 Jan 2014 17:32:38 +0100
Subject: next steps for closure iterators

---
 compiler/parser.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'compiler/parser.nim')

diff --git a/compiler/parser.nim b/compiler/parser.nim
index d255949a4..2b845f3da 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -1,7 +1,7 @@
 #
 #
 #           The Nimrod Compiler
-#        (c) Copyright 2013 Andreas Rumpf
+#        (c) Copyright 2014 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
@@ -31,7 +31,7 @@ type
   TParser*{.final.} = object  # a TParser object represents a module that
                               # is being parsed
     currInd: int              # current indentation
-    firstTok: bool
+    firstTok, strongSpaces: bool
     lex*: TLexer              # the lexer that is used for parsing
     tok*: TToken              # the current token
     inPragma: int
-- 
cgit 1.4.1-2-gfad0


From 3e5cb6644f4df51c3f3131108fc7836c431b53c2 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Thu, 23 Jan 2014 17:19:12 +0100
Subject: typeClasses now documented in grammar.txt

---
 compiler/parser.nim | 4 ++++
 doc/grammar.txt     | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'compiler/parser.nim')

diff --git a/compiler/parser.nim b/compiler/parser.nim
index 2b845f3da..1084c3b4a 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -1048,6 +1048,7 @@ proc parseTypeDesc(p: var TParser): PNode =
 
 proc parseTypeDefAux(p: var TParser): PNode = 
   #| typeDefAux = simpleExpr
+  #|            | 'generic' typeClass
   result = simpleExpr(p, pmTypeDef)
 
 proc makeCall(n: PNode): PNode =
@@ -1672,6 +1673,9 @@ proc parseTypeClassParam(p: var TParser): PNode =
     result = p.parseSymbol
 
 proc parseTypeClass(p: var TParser): PNode =
+  #| typeClassParam = ('var')? symbol
+  #| typeClass = typeClassParam ^* ',' (pragma)? ('of' typeDesc ^* ',')?
+  #|               &IND{>} stmt
   result = newNodeP(nkTypeClassTy, p)
   getTok(p)
   var args = newNode(nkArgList)
diff --git a/doc/grammar.txt b/doc/grammar.txt
index b002747fa..54c2217d8 100644
--- a/doc/grammar.txt
+++ b/doc/grammar.txt
@@ -97,6 +97,7 @@ primary = typeKeyw typeDescK
         / 'bind' primary
 typeDesc = simpleExpr
 typeDefAux = simpleExpr
+           | 'generic' typeClass
 macroColon = ':' stmt? ( IND{=} 'of' exprList ':' stmt 
                        | IND{=} 'elif' expr ':' stmt
                        | IND{=} 'except' exprList ':' stmt
@@ -163,6 +164,9 @@ objectCase = 'case' identWithPragma ':' typeDesc ':'? COMMENT?
 objectPart = IND{>} objectPart^+IND{=} DED
            / objectWhen / objectCase / 'nil' / declColonEquals
 object = 'object' pragma? ('of' typeDesc)? COMMENT? objectPart
+typeClassParam = ('var')? symbol
+typeClass = typeClassParam ^* ',' (pragma)? ('of' typeDesc ^* ',')?
+              &IND{>} stmt
 distinct = 'distinct' optInd typeDesc
 typeDef = identWithPragma genericParamList? '=' optInd typeDefAux
             indAndComment?
-- 
cgit 1.4.1-2-gfad0


From 9af1ab5f4331b4857f6bcc57a8c7318faea36a7e Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sat, 25 Jan 2014 14:22:05 +0100
Subject: fixes a minor parser bug

---
 compiler/parser.nim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'compiler/parser.nim')

diff --git a/compiler/parser.nim b/compiler/parser.nim
index 1084c3b4a..3765557b9 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -1209,8 +1209,7 @@ proc parseReturnOrRaise(p: var TParser, kind: TNodeKind): PNode =
   if p.tok.tokType == tkComment:
     skipComment(p, result)
     addSon(result, ast.emptyNode)
-  elif p.tok.indent >= 0 and p.tok.indent <= p.currInd or
-      p.tok.tokType == tkEof:
+  elif p.tok.indent >= 0 and p.tok.indent <= p.currInd or not isExprStart(p):
     # NL terminates:
     addSon(result, ast.emptyNode)
   else:
-- 
cgit 1.4.1-2-gfad0