Fixes on solcore parser. Makes return type defaults to unit, when no type provided. Added a new test case.

Signed-off-by: Rodrigo Ribeiro <[email protected]>

Author: rodrigogribeiro

src/Solcore/Frontend/Parser/SolcoreParser.y

@@ -224,7 +224,7 @@ Signature :: { Signature }
 Signature : SigPrefix 'function' Name '(' ParamList ')' OptRetTy {Signature (fst $1) (snd $1) $3 $5 $7}
 
 AnnSignature :: { Signature }
-AnnSignature : SigPrefix 'function' Name '(' AnnParamList ')' RetTy {Signature (fst $1) (snd $1) $3 $5 $7}
+AnnSignature : SigPrefix 'function' Name '(' AnnParamList ')' OptRetTy {Signature (fst $1) (snd $1) $3 $5 (maybe unitTy Just $7)}
 
 SigPrefix :: {([Ty], [Pred])}
 SigPrefix : 'forall' Tyvars '.' ConstraintList '=>' {($2, $4)}
@@ -290,9 +290,6 @@ OptRetTy :: { Maybe Ty }
 OptRetTy : '->' Type                               {Just $2}
          | {- empty -}                             {Nothing}
 
-RetTy :: { Maybe Ty }
-RetTy : '->' Type                                  {Just $2}
-
 -- Contract constructor
 
 Constructor :: { Constructor }
@@ -585,6 +582,9 @@ tupleExp (t1 : ts) = pairExp t1 (tupleExp ts)
 rmquotes :: String -> String
 rmquotes = read
 
+unitTy :: Maybe Ty
+unitTy = Just (TyCon (Name "()") [])
+
 parseError (Token (line, col) lexeme)
   = alexError $ "Parse error while processing lexeme: " ++ show lexeme
                 ++ "\n at line " ++ show line ++ ", column " ++ show col

test/Cases.hs

@@ -232,6 +232,7 @@ cases =
     , runTestExpectingFailure "xref.solc" caseFolder
     , runTestForFile "yul-function-typing.solc" caseFolder
     , runTestForFile "yul-return.solc" caseFolder
+    , runTestForFile "optional-return-function-contract.solc" caseFolder
     ]
  where
   caseFolder = "./test/examples/cases"

test/examples/cases/optional-return-function-contract.solc

@@ -0,0 +1,6 @@
+contract Foo {
+
+  function foo (x : word) {
+
+  }
+}