Add subroutines

angeles-ricardo-89 · Oct 26, 2017 · e6e1c59 · e6e1c59
1 parent 64196ce
commit e6e1c59
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/build.sh b/build.sh
@@ -11,3 +11,4 @@ javac fortran*.java
 
 # Test:
 $grun fortran module -tree examples/m1.f90
+$grun fortran module -tree examples/subroutine1.f90
diff --git a/examples/subroutine1.f90 b/examples/subroutine1.f90
@@ -0,0 +1,14 @@
+module subroutine1
+implicit none
+
+contains
+
+subroutine some_subroutine
+integer :: a, b, c
+end subroutine
+
+subroutine some_other_subroutine
+integer :: a, b
+end subroutine
+
+end module
diff --git a/fortran.g4 b/fortran.g4
@@ -1,7 +1,7 @@
 grammar fortran;
 
 module
-    : 'module' IDENT 'implicit none' decl*  'end' IDENT?
+    : 'module' IDENT 'implicit none' decl* ('contains' subroutine+ )?  'end' IDENT?
     ;
 
 decl
@@ -42,6 +42,10 @@ modifier
     : 'parameter' | 'intent' | 'dimension' | 'allocatable' | 'pointer'
     ;
 
+subroutine
+    : 'subroutine' IDENT decl* 'end' 'subroutine'?
+    ;
+
 NUMBER
     : ([0-9]+ '.' [0-9]* | '.' [0-9]+) ([eEdD] [+-]? [0-9]+)?
     |  [0-9]+                          ([eEdD] [+-]? [0-9]+)?