edits

[cdsspec-compiler.git] / src / edu / uci / eecs / specExtraction / SpecNaming.java

diff --git a/src/edu/uci/eecs/specExtraction/SpecNaming.java b/src/edu/uci/eecs/specExtraction/SpecNaming.java
index 11918ed8125eb6a5ecd64a578bb11485a86b0f26..aa021af99e463e08835630138eea05544de849f6 100644 (file)
--- a/src/edu/uci/eecs/specExtraction/SpecNaming.java
+++ b/src/edu/uci/eecs/specExtraction/SpecNaming.java
@@ -24,6 +24,9 @@ public class SpecNaming {
        public static final String FinalState = "Final";
        public static final String PrintState = "Print";
        public static final String Commutativity = "Commutativity";
+       
+       // Define construct
+       public static final String Define = "Define";
 
        // Interface construct
        public static final String Interface = "Interface";
@@ -85,9 +88,19 @@ public class SpecNaming {
        public static final String MODELASSERT = "\"model-assert.h\"";
        public static final String LIBRACE = "\"librace.h\"";
        public static final String SPECANNOTATION = "\"specannotation.h\"";
-       public static final String SPECCOMMON = "\"spec_common.h\"";
+       public static final String SPEC_COMMON = "\"spec_common.h\"";
        public static final String CDSSPEC = "\"cdsspec.h\"";
        public static final String METHODCALL = "\"methodcall.h\"";
+       
+       // Header files to include in the cdsspec-generated.h
+       public static final String SPECANNOTATION_API = "\"specannotation-api.h\"";
+       
+       // Header files to include in the cdsspec-generated.cc
+       // <cdsannotate.h>
+       // "spec_common.h"
+       // "methodcall.h"
+       // "cdsspec.h"
+       // "specannotation.h"
 
        static {
                // Initialize the header set and list
@@ -107,7 +120,7 @@ public class SpecNaming {
                includedHeadersList.add(MODELASSERT);
                includedHeadersList.add(LIBRACE);
                includedHeadersList.add(SPECANNOTATION);
-               includedHeadersList.add(SPECCOMMON);
+               includedHeadersList.add(SPEC_COMMON);
                includedHeadersList.add(METHODCALL);
                includedHeadersList.add(CDSSPEC);
 
@@ -124,6 +137,7 @@ public class SpecNaming {
 
        // Some CDSSpec keywords and function names
        public static final String NewSize = "NEW_SIZE";
+       public static final String New = "NEW";
        // Some CDSSpec types
        public static final String CString = "CSTR";
        public static final String EmptyCString = "_EMPTY";
@@ -140,6 +154,7 @@ public class SpecNaming {
        public static final String AnnoInit = "AnnoInit";
        public static final String AnnoTypeInit = "INIT";
        public static final String AnnoInterfaceInfo = "AnnoInterfaceInfo";
+       public static final String CAnnoInterfaceInfo = "CAnnoInterfaceInfo";
        public static final String SpecAnnotation = "SpecAnnotation";
 
        // Some CDSSpec state functions
@@ -151,6 +166,7 @@ public class SpecNaming {
        // Functions for instrumenting annotation
        public static final String CreateInitAnnoFunc = "_createInitAnnotation";
        public static final String CreateInterfaceBeginAnnoFunc = "_createInterfaceBeginAnnotation";
+       public static final String SetInterfaceBeginAnnoValueFunc = "_setInterfaceBeginAnnotationValue";
        public static final String CreateOPDefineAnnoFunc = "_createOPDefineAnnotation";
        public static final String CreatePotentialOPAnnoFunc = "_createPotentialOPAnnotation";
        public static final String CreateOPCheckAnnoFunc = "_createOPCheckAnnotation";