Merge pull request #39 from cpfr/pattern-matching

Pattern matching
MontysCoconut · Nov 3, 2015 · 77e31b7 · 77e31b7
2 parents 1a42c07 + 9052eda
commit 77e31b7
Show file tree

Hide file tree

Showing 37 changed files with 1,119 additions and 99 deletions.
diff --git a/src/main/antlr4/de/uni/bremen/monty/moco/antlr/Monty.g4 b/src/main/antlr4/de/uni/bremen/monty/moco/antlr/Monty.g4
@@ -17,6 +17,7 @@ importLine
 declaration
   : independentDeclaration
   | classDeclaration
+  | caseClassDeclaration
   | generatorDeclaration
   ;
 
@@ -34,6 +35,14 @@ classDeclaration
     Dedent
   ;
 
+caseClassDeclaration
+  : 'case' 'class' type '(' (parameterListWithoutDefaults)? ')' ('inherits' typeList)?
+    (':' EndOfLine
+    Indent
+        (memberDeclaration+ | 'pass' EndOfLine)
+    Dedent)?
+  ;
+
 memberDeclaration
   : accessModifier? independentDeclaration
   | accessModifier? abstractMethodDeclaration
@@ -107,11 +116,11 @@ statementBlock
   ;
 
 statement
-  : whileStatement                                                  #whileStm
+  : declaration                                                     #declStm
+  | whileStatement                                                  #whileStm
   | forStatement                                                    #forStm
   | ifStatement                                                     #ifStm
   | tryStatement                                                    #tryStm
-  | declaration                                                     #declStm
   | unpackAssignment                                                #unpackAssignStm
   | assignment                                                      #assignStm
   | compoundAssignment                                              #compoundAssign
@@ -122,6 +131,7 @@ statement
   | command='break' EndOfLine                                       #breakStm
   | functionCall EndOfLine                                          #funcCallStm
   | left=expression operator='.' right=functionCall EndOfLine       #MemberAccessStmt
+  | caseStatement                                                   #caseStm
   ;
 
 /* while loop: The expression must be a condition (i.e. Boolean expression). */
@@ -296,4 +306,41 @@ listGenerator
 
 listFilter
   : 'if' expression
+  ;
+
+
+/* pattern matching */
+
+caseStatement
+  : 'case' expression 'of' ':' EndOfLine caseBlock
+  ;
+
+caseBlock
+  : Indent
+      (pattern ':' EndOfLine statementBlock)+
+    Dedent
+  ;
+
+patternGuard
+  : 'if' expression
+  ;
+
+pattern
+  : (typedPattern
+  | '_'
+  | compoundPattern
+  | expression) patternGuard?
+  ;
+
+typedPattern
+  : type Identifier
+  | type ('_')?
+  ;
+
+compoundPattern
+  : type? '(' patternList? ')'
+  ;
+
+patternList
+  : pattern (',' pattern )*
   ;
diff --git a/src/main/antlr4/imports/lex.g4 b/src/main/antlr4/imports/lex.g4
@@ -148,7 +148,7 @@ ClassIdentifier
 
 Identifier
   : '_'* LowercaseLetter (LowercaseLetter | UppercaseLetter | Digit | '_')*
-  | '_'+ (LowercaseLetter | UppercaseLetter | Digit | '_')*
+  | '_'+ (LowercaseLetter | UppercaseLetter | Digit | '_')+
   ;
 
 ConstantIdentifier

diff --git a/src/main/java/de/uni/bremen/monty/moco/Main.java b/src/main/java/de/uni/bremen/monty/moco/Main.java
@@ -243,10 +243,6 @@ public static void main(String[] args) throws IOException, InterruptedException
 		IOUtils.copy(Main.class.getResourceAsStream("/std_llvm_include.ll"), writer);
 
 		Package ast = buildPackage(inputFileName);
-		if (printAST) {
-			(new PrintVisitor()).visitDoubleDispatched(ast);
-			return;
-		}
 
 		if (!visitVisitors(ast, stopOnFirstError, writer.getBuffer())) {
 			return;