parser checked

[cdsspec-compiler.git] / grammer / spec-compiler.jj

diff --git a/grammer/spec-compiler.jj b/grammer/spec-compiler.jj
index ca38b5facb925cb5208d3bf36b535214c16c3c1f..2238268a43ac644a62e490703ea226c6d3060f2f 100644 (file)
--- a/grammer/spec-compiler.jj
+++ b/grammer/spec-compiler.jj
@@ -31,6 +31,8 @@
        @Check: (Optional)
                ...
        @Action: (Optional)
+               @DefineVar: Type var1 = SomeExpression (Optional)
+               @Code (Optional)
                ...
        @Post_action: (Optional)
        @Post_check: (Optional)
@@ -69,6 +71,8 @@ package edu.uci.eecs.specCompiler.grammerParser;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -80,6 +84,8 @@ import edu.uci.eecs.specCompiler.specExtraction.PotentialCPDefineConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineCheckConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.ConditionalInterface;
+import edu.uci.eecs.specCompiler.specExtraction.ActionSubConstruct;
+import edu.uci.eecs.specCompiler.specExtraction.ActionSubConstruct.DefineVar;
 
        public class SpecParser {
                public static void main(String[] argvs)
@@ -87,12 +93,21 @@ import edu.uci.eecs.specCompiler.specExtraction.ConditionalInterface;
                        try {
                                FileInputStream fis = new FileInputStream("./grammer/spec.txt");
                                SpecParser parser = new SpecParser(fis);
-                               parser.Start();
+                               parser.Parse();
                                System.out.println("Parsing finished!");
                        } catch (FileNotFoundException e) {
                                e.printStackTrace();
                        }
                }
+       
+               public static Construct parseSpec(String text)
+               throws ParseException, TokenMgrError {
+                       InputStream input = new ByteArrayInputStream(text.getBytes());
+                       SpecParser parser = new SpecParser(input);
+                       return parser.Parse();
+               }
+
+
        }
 PARSER_END(SpecParser)
 
@@ -145,6 +160,10 @@ TOKEN :
        <CHECK: "@Check:">
 |
        <ACTION: "@Action:">
+|
+       <DEFINEVAR: "@DefineVar:">
+|
+       <CODE: "@Code:">
 |
        <POST_ACTION: "@Post_action:">
 |
@@ -190,6 +209,8 @@ TOKEN :
        <STAR: "*">
 |
        <NEGATE: "~">
+|
+       <EXCLAMATION: "!">
 |
        <AND: "&">
 |
@@ -291,7 +312,7 @@ TOKEN :
        < #HEXADECIMAL_EXPONENT: ["p","P"] (["+","-"])? (["0"-"9"])+ >
 }
 
-Construct Start() :
+Construct Parse() :
 {
        Construct res;  
 }
@@ -305,7 +326,7 @@ Construct Start() :
        )
        <EOF>
        {
-               System.out.println(res);
+               //System.out.println(res);
                return res;
        }
 }
@@ -341,13 +362,15 @@ String C_CPP_CODE() :
                text = new StringBuilder();
                t = new Token();
        }
-       ((
+       (
+       //LOOKAHEAD(2)
+       (
        t = <IDENTIFIER> | t = <EQUALS> | t = <OPEN_PAREN> | t = <CLOSE_PAREN> |
        t = <OPEN_BRACKET> | t = <CLOSE_BRACKET> | t = <HB_SYMBOL> | t = <COMMA> |
-       t = <DOT> | t = <STAR> | t = <NEGATE> | t = <AND> | t = <OR> | t = <MOD> | t = <PLUS> |
+       t = <DOT> | t = <STAR> | t = <NEGATE> | t = <EXCLAMATION> | t = <AND> | t = <OR> | t = <MOD> | t = <PLUS> |
        t = <PLUSPLUS> | t = <MINUS> | t = <MINUSMINUS> | t = <DIVIDE> | t = <BACKSLASH> |
        t = <LESS_THAN> | t = <GREATER_THAN> | t = <GREATER_EQUALS>     | t = <LESS_EQUALS> |
-       t = <LOGICAL_EQUALS> | t = <NOT_EQUALS> | t = <LOGICAL_AND> | t = <LOGICAL_OR> | t = <XOR>
+       t = <LOGICAL_EQUALS> | t = <NOT_EQUALS> | t = <LOGICAL_AND> | t = <LOGICAL_OR> | t = <XOR> |
        t = <QUESTION_MARK> | t = <COLON> | t = <DOUBLECOLON> |
        t = <SEMI_COLON> | t = <STRING_LITERAL> | t = <CHARACTER_LITERAL> |
        t = <INTEGER_LITERAL> | t = <FLOATING_POINT_LITERAL>
@@ -431,18 +454,19 @@ void Happens_before(GlobalConstruct inst) :
 InterfaceConstruct Interface() :
 {
        InterfaceConstruct res;
-       String interfaceName, condition, idCode, check, action, postAction,
+       String interfaceName, condition, idCode, check, postAction,
                postCheck, commitPoint, hbLabel, hbCondition;
+       ActionSubConstruct action;
        ArrayList<String> commitPointSet;
        HashMap<String, String> hbConditions;
 }
 {
        {
                res = null;
+               action = null;
                condition = "";
                idCode = "";
                check = "";
-               action = "";
                postAction = "";
                postCheck = "";
                commitPointSet = new ArrayList<String>();
@@ -481,7 +505,7 @@ InterfaceConstruct Interface() :
                        )*
                        (<ID> (idCode = C_CPP_CODE()))?
                        (<CHECK> (check = C_CPP_CODE()))?
-                       (<ACTION> (action = C_CPP_CODE()))?
+                       (action = Action())?
                        (<POST_ACTION> (postAction = C_CPP_CODE()))?
                        (<POST_CHECK> (postCheck = C_CPP_CODE()))?
                <END>
@@ -493,6 +517,37 @@ InterfaceConstruct Interface() :
        }
 }
 
+ActionSubConstruct Action() :
+{
+       String type, name, expr, defineVarStr, code;
+       ArrayList<DefineVar> defineVars;
+}
+{
+       {
+               defineVars = new ArrayList<DefineVar>();
+               code = "";
+       }
+       <ACTION>
+       (
+               (
+               (<DEFINEVAR> (defineVarStr = C_CPP_CODE()) 
+               {
+                       int eqIdx = defineVarStr.indexOf('=');
+                       int typeEnd = defineVarStr.lastIndexOf(' ', eqIdx - 2);
+                       type = defineVarStr.substring(0, typeEnd);
+                       name = defineVarStr.substring(typeEnd + 1, eqIdx - 1);
+                       expr = defineVarStr.substring(eqIdx + 2);
+                       DefineVar defineVar = new DefineVar(type, name, expr);
+                       defineVars.add(defineVar);
+               })*  (<CODE> (code = C_CPP_CODE()))? ) 
+       )
+       
+       {
+               ActionSubConstruct res = new ActionSubConstruct(defineVars, code);
+               return res;
+       }
+}
+
 PotentialCPDefineConstruct Potential_commit_point_define() :
 {
        PotentialCPDefineConstruct res;