fix intliteral 0

Test/TestParser.hs

@@ -200,6 +200,9 @@ testExpressionSimpleFieldAccess = TestCase $
 testExpressionFieldSubAccess = TestCase $
     assertEqual "expect NameResolution without this" (BinaryOperation NameResolution (Reference "a") (Reference "b")) $
     parseExpression [IDENTIFIER "a",DOT,IDENTIFIER "b"]
+testExpressionConstructorCall = TestCase $
+    assertEqual "expect constructor call" (StatementExpressionExpression (ConstructorCall "Foo" [])) $
+    parseExpression [NEW,IDENTIFIER "Foo",LBRACE,RBRACE]
 
 testStatementIfThen = TestCase $
     assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) Nothing] $
@@ -217,7 +220,16 @@ testStatementAssign = TestCase $
 testStatementMethodCallNoParams = TestCase $
     assertEqual "expect methodcall statement no params" [StatementExpressionStatement (MethodCall (Reference "this") "foo" [])] $
     parseStatement [IDENTIFIER "foo",LBRACE,RBRACE,SEMICOLON]
+testStatementConstructorCall = TestCase $
+    assertEqual "expect constructor call" [StatementExpressionStatement (ConstructorCall "Foo" [])] $
+    parseStatement [NEW,IDENTIFIER "Foo",LBRACE,RBRACE,SEMICOLON]
+testStatementConstructorCallWithArgs = TestCase $
+    assertEqual "expect constructor call" [StatementExpressionStatement (ConstructorCall "Foo" [Reference "b"])] $
+    parseStatement [NEW,IDENTIFIER "Foo",LBRACE,IDENTIFIER "b",RBRACE,SEMICOLON]
 
+testStatementPreIncrement = TestCase $
+    assertEqual "expect increment" [StatementExpressionStatement $ PostIncrement $ Reference "a"] $
+    parseStatement [IDENTIFIER "a",INCREMENT,SEMICOLON]
 
 
 tests = TestList [
@@ -279,9 +291,13 @@ tests = TestList [
     testExpressionFieldAccess,
     testExpressionSimpleFieldAccess,
     testExpressionFieldSubAccess,
+    testExpressionConstructorCall,
     testStatementIfThen,
     testStatementIfThenElse,
     testStatementWhile,
     testStatementAssign,
-    testStatementMethodCallNoParams
+    testStatementMethodCallNoParams,
+    testStatementConstructorCall,
+    testStatementConstructorCallWithArgs,
+    testStatementIncrement
     ]

src/Parser/JavaParser.y

@@ -117,7 +117,7 @@ modifier         : PUBLIC { }
                  | STATIC { }
                  | ABSTRACT { }
 
-classtype        : classorinterfacetype{ }
+classtype        : classorinterfacetype { $1 }
 
 classbodydeclaration : classmemberdeclaration { $1 }
                  | constructordeclaration { $1 }
@@ -249,12 +249,12 @@ assignment       : lefthandside assignmentoperator assignmentexpression {
         
 
 statementexpression : assignment { $1 }
-                --  | preincrementexpression { }
+                 | preincrementexpression { $1 }
-                --  | predecrementexpression { }
+                 | predecrementexpression { $1 }
-                --  | postincrementexpression { }
+                 | postincrementexpression { $1 }
-                --  | postdecrementexpression { }
+                 | postdecrementexpression { $1 }
                  | methodinvocation { $1 }
-                --  | classinstancecreationexpression { }
+                 | classinstancecreationexpression { $1 }
 
 ifthenelsestatementnoshortif :IF LBRACE expression  RBRACE  statementnoshortif
                               ELSE statementnoshortif  { }
@@ -292,8 +292,8 @@ methodinvocation : simplename LBRACE   RBRACE  { MethodCall (Reference "this") $
                  | primary  DOT IDENTIFIER LBRACE RBRACE  { MethodCall $1 $3 [] }
                  | primary  DOT IDENTIFIER LBRACE argumentlist  RBRACE  { MethodCall $1 $3 $5 }
      
-classinstancecreationexpression : NEW classtype LBRACE   RBRACE  { }
+classinstancecreationexpression : NEW classtype LBRACE   RBRACE  { ConstructorCall $2 [] }
-                 | NEW classtype LBRACE  argumentlist  RBRACE  { }
+                 | NEW classtype LBRACE  argumentlist  RBRACE  { ConstructorCall $2 $4 }
 
 conditionalandexpression : inclusiveorexpression { $1 }
 
@@ -318,7 +318,7 @@ inclusiveorexpression : exclusiveorexpression { $1 }
 primarynonewarray : literal { $1 }
                  | THIS { Reference "this" }
                  | LBRACE expression RBRACE  { $2 }
-                --  | classinstancecreationexpression { }
+                 | classinstancecreationexpression { StatementExpressionExpression $1 }
                  | fieldaccess { $1 }
                  | methodinvocation { StatementExpressionExpression $1 }
 

src/Parser/Lexer.x

@@ -72,7 +72,7 @@ tokens :-
     -- end keywords
     $JavaLetter$JavaLetterOrDigit*  { \s -> IDENTIFIER s }
     -- Literals
-    [1-9]([0-9\_]*[0-9])* { \s -> case readMaybe $ filter ((/=) '_') s of Just a -> INTEGERLITERAL a; Nothing -> error ("failed to parse INTLITERAL " ++ s) }
+    [0-9]([0-9\_]*[0-9])* { \s -> case readMaybe $ filter ((/=) '_') s of Just a -> INTEGERLITERAL a; Nothing -> error ("failed to parse INTLITERAL " ++ s) }
     "'"."'" { \s -> case (s) of _ : c : _ -> CHARLITERAL c; _ -> error ("failed to parse CHARLITERAL " ++ s) }
     -- separators
     "(" { \_ -> LBRACE }