Merge lp:~oontvoo/cfg-to-pda/define-rules into lp:cfg-to-pda

[Vy Nguyen]

define simple rules + test and fix pom.xml (update junit to 4.)

=== modified file 'pom.xml'
--- pom.xml	2012-10-18 05:36:28 +0000
+++ pom.xml	2012-10-18 06:50:23 +0000
@@ -14,14 +14,15 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <dependencies>
+ <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.1</version>
+        <scope>test</scope>
     </dependency>
-  </dependencies>
+</dependencies>
+
   
   <build>
     <plugins>

=== modified file 'src/main/javacc/CFGGrammar.jj'
--- src/main/javacc/CFGGrammar.jj	2012-10-18 05:52:49 +0000
+++ src/main/javacc/CFGGrammar.jj	2012-10-18 06:50:23 +0000
@@ -23,7 +23,9 @@
  * to a PDA
  *
  * All upercase letters are `variables`
- * Anything else (lowercase and symbol) is considered `terminal`
+ * Anything else (lowercase and symbol 
+ * (except `=` and `>` and `=>` because these two are used to make up the 'arrow') 
+ * is considered `terminal`
  */
 
 options 
@@ -38,11 +40,7 @@
 
 class CFGGrammar
 {
-        public	static void main( String[] args ) throws ParseException, TokenMgrError 
-        {
-                CFGGrammar parser = new CFGGrammar( System.in );
-                parser.Start();
-        }
+    // TODO
 }
 PARSER_END(CFGGrammar)
 
@@ -50,11 +48,21 @@
 {
 }
 {
-	<NUMBER>
-	( <PLUS> <NUMBER>)*
-	<EOF>
+    <UPPER>
+    <ARROW>
+    (<UPPER> | <LOWER>)
+    (<PIPE> (<UPPER> | <LOWER>))*
+    [<EOF>]
 }
 
 SKIP : {" " | "\n" | "\r" | "\r\n"}
-TOKEN : { <PLUS: "+">} 
-TOKEN : { <NUMBER: (["0"-"9"])+ >} 
+TOKEN :
+{
+ <ARROW: "=>" >
+|
+ <LOWER: (["a"-"z"])+ >
+|
+ <PIPE: "|">
+| 
+ <UPPER: (["A"-"Z"])+ >
+}

=== modified file 'src/test/java/parser/ParserTest.java'
--- src/test/java/parser/ParserTest.java	2012-10-18 05:52:49 +0000
+++ src/test/java/parser/ParserTest.java	2012-10-18 06:50:23 +0000
@@ -20,12 +20,32 @@
 
 package parser;
 
+import java.io.StringReader;
+import java.io.BufferedReader;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 public class ParserTest
 {
-    public static void main (String args[])
-    {
-        
-        CFGGrammar gram = new CFGGrammar(System.in);
-        
+    
+    @Test
+    public void testSimple() throws ParseException
+    {
+        doTest("A=> a");
+        
+    }
+    
+    @Test
+    public void testMultipleProductions() throws ParseException
+    {
+        doTest("A=> a | AB | Ab");
+        
+    }
+    
+    private static void doTest(String in) throws ParseException
+    {
+        CFGGrammar parser = new CFGGrammar(new BufferedReader(new StringReader(in)));
+        
+        parser.Start();
     }
 }
\ No newline at end of file