rought bnf working - had to re-work lexer to fit in with bnf - so lex…

…er needs a little more tweaking now as well

src/main/java/net/kenro/ji/jin/crystal/parser/Crystal.bnf

@@ -196,9 +196,9 @@
         LINE_COMMENT =                       "line_comment"
 
 
-//        IDENT               = "regexp:\w+"
-//        comment             = 'regexp:#.*'
-//        space               = 'regexp:\s+'
+        IDENT               = "regexp:\w+"
+        comment             = 'regexp:#.*'
+        space               = 'regexp:\s+'
 
 //        number              = 'regexp:(\+|\-)?(0b[01_]+|0o[0-7_]+|0x[a-fA-f\d_]+|[\d_]+)(\.[\d_]+)?(e[-+]?[\d_]+)?(_?(i|f|u)(8|16|32|64))?'
 //        string              = 'regexp:("([^\"\\]|\\.)*")'
@@ -207,9 +207,9 @@
     ]
 }
 
-crystalFile ::= IF expression 'then' compositeStatement ['elsif' expression 'then' compositeStatement] ['else' compositeStatement] 'end'
+crystalFile ::= item_*
 
-//private item_ ::= (statements | expressions | primary | function)
+private item_ ::= (statements | expressions | primary | function)
 
 compositeStatement ::= (statements | expressions)
 

src/test/resources/gold/parser/current/aaa_intial.cr.psi

@@ -1,10 +1,34 @@
 Crystal File
-  CrystalASTWrapperElement(Program)
-    CrystalASTWrapperElement(Module)
-      PsiElement(module)('module')
-      PsiElement(whitespace)(' ')
-      CrystalASTWrapperElement(ProgramModule)
-        CrystalASTWrapperElement(ProperName)
-          PsiElement(proper name)('Initial')
-          PsiElement(whitespace)('\n')
-      PsiElement(end)('end')
+  CrystalStatementsImpl(STATEMENTS)
+    CrystalStatementImpl(STATEMENT)
+      CrystalExpressionImpl(EXPRESSION)
+        CrystalArgImpl(ARG)
+          CrystalPrimaryImpl(PRIMARY)
+            PsiElement(if)('if')
+            PsiWhiteSpace(' ')
+            CrystalExpressionImpl(EXPRESSION)
+              CrystalArgImpl(ARG)
+                CrystalPrimaryImpl(PRIMARY)
+                  CrystalLiteralImpl(LITERAL)
+                    PsiElement(true)('true')
+            PsiWhiteSpace(' ')
+            PsiElement(then)('then')
+            PsiWhiteSpace('\n ')
+            CrystalCompositeStatementImpl(COMPOSITE_STATEMENT)
+              CrystalStatementsImpl(STATEMENTS)
+                CrystalStatementImpl(STATEMENT)
+                  CrystalExpressionImpl(EXPRESSION)
+                    CrystalArgImpl(ARG)
+                      CrystalLhsImpl(LHS)
+                        CrystalVariableImpl(VARIABLE)
+                          CrystalVarNameImpl(VAR_NAME)
+                            PsiElement(IDENT)('a')
+                      PsiWhiteSpace(' ')
+                      PsiElement(=)('=')
+                      PsiWhiteSpace(' ')
+                      CrystalArgImpl(ARG)
+                        CrystalPrimaryImpl(PRIMARY)
+                          CrystalLiteralImpl(LITERAL)
+                            PsiElement(NUMBER)('1')
+            PsiWhiteSpace('\n')
+            PsiElement(end)('end')