Add expressions

Manali0806 · Oct 26, 2017 · e00c0c4 · e00c0c4
1 parent 4c916cb
commit e00c0c4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/build.sh b/build.sh
@@ -11,4 +11,7 @@ javac fortran*.java
 
 # Test:
 $grun fortran module -tree examples/m1.f90
+echo
 $grun fortran module -tree examples/subroutine1.f90
+echo
+$grun fortran module -tree examples/expr1.f90
diff --git a/examples/expr1.f90 b/examples/expr1.f90
@@ -0,0 +1,12 @@
+module expr1
+implicit none
+
+contains
+
+subroutine a
+integer :: a, b
+a = 1+2*3
+b = (1+2+a)*3
+end subroutine
+
+end module
diff --git a/fortran.g4 b/fortran.g4
@@ -27,7 +27,12 @@ var_sym_decl
     ;
 
 expr
-	: IDENT | NUMBER | fn_call
+	: expr ('*'|'/') expr
+    | expr ('+'|'-') expr
+    | NUMBER
+    | IDENT
+    | fn_call
+    | '(' expr ')'
 	;
 
 fn_call