Issue #45: Extend the grammer to explicitly support CURSOR variables …

…in a declaration section.

Also allow "COLLATE" and "DEFAULT" in regular variable declarations.

lib/piggly/parser/grammar.tt

@@ -271,9 +271,21 @@ grammar Piggly
   end
 
   rule varDeclaration
+    varDeclarationMisc / varDeclarationCursor
+  end
+
+  rule varDeclarationMisc
     name:tIdentifier tSpace ( kwCONSTANT tSpace )?
-    type:tType ( tSpace  kwNOT tSpace kwNULL )?
-               ( tSpace? kwASSIGN tSpace? rval:expressionUntilSemiColon )?
+    type:tType ( tSpace  kwCOLLATE name:tIdentifier )?
+               ( tSpace  kwNOT tSpace kwNULL )?
+               ( tSpace? ( kwASSIGN / kwDEFAULT ) tSpace? rval:expressionUntilSemiColon )?
+    tSpace?
+    ';' tSpace?
+  end
+
+  rule varDeclarationCursor
+    name:tIdentifier tSpace ( kwNO tSpace kwSCROLL tSpace )? kwCURSOR tSpace
+      rval:expressionUntilSemiColon
     tSpace?
     ';' tSpace?
   end
@@ -494,7 +506,7 @@ grammar Piggly
     #   EXIT WHEN cond;
 
     kwWHEN / kwAS / kwASSIGN / kwALIAS / kwBEGIN / kwBY / kwCASE / kwARRAY
-    / kwCONSTANT / kwCONTINUE / kwCURSOR / kwDEBUG / kwDECLARE / kwDEFAULT
+    / kwCOLLATE / kwCONSTANT / kwCONTINUE / kwCURSOR / kwDEBUG / kwDECLARE / kwDEFAULT
     / kwDIAGNOSTICS / kwELSE / kwELSIF / kwEND / kwEXCEPTION / kwEXECUTE / kwEXIT
     / kwFOR / kwFROM / kwGET / kwIF / kwIN / kwINFO / kwINSERT / kwINTO
     / kwIS / kwLOG / kwLOOP / kwNOT / kwNOTICE / kwNULL / kwFOREACH
@@ -536,6 +548,10 @@ grammar Piggly
     'case' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
   end
 
+  rule kwCOLLATE
+    'collate' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
+  end
+
   rule kwCONSTANT
     'constant' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
   end
@@ -640,6 +656,10 @@ grammar Piggly
     'next' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
   end
 
+  rule kwNO
+    'no' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
+  end
+
   rule kwNOT
     'not' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
   end