edits

[cdsspec-compiler.git] / notes / definition.cc

diff --git a/notes/definition.cc b/notes/definition.cc
index bcc01e7b167702a6b062fcaa5d72770643b48b0c..0c5b7965174727e5414f005c0421f33188937e35 100644 (file)
--- a/notes/definition.cc
+++ b/notes/definition.cc
@@ -32,7 +32,7 @@ typedef set<int> IntSet;
 
 /********** More general specification-related types and operations **********/
 
 
 /********** More general specification-related types and operations **********/
 

-#define NewSet new set<Method>
+#define NewMethodSet new set<Method>

 
 #define CAT(a, b) CAT_HELPER(a, b) /* Concatenate two symbols for macros! */
 #define CAT_HELPER(a, b) a ## b
 
 #define CAT(a, b) CAT_HELPER(a, b) /* Concatenate two symbols for macros! */
 #define CAT_HELPER(a, b) a ## b


@@ -74,7 +74,7 @@ typedef set<int> IntSet;
 /*
 #define Subset(s, subset, condition) \
        MethodSet original = s; \
 /*
 #define Subset(s, subset, condition) \
        MethodSet original = s; \

-       MethodSet subset = NewSet; \
+       MethodSet subset = NewMethodSet; \

        ForEach (_M, original) { \
                if ((condition)) \
                        subset->insert(_M); \
        ForEach (_M, original) { \
                if ((condition)) \
                        subset->insert(_M); \


@@ -213,7 +213,7 @@ inline MethodSet MakeSet(int count, ...) {
        MethodSet res;
 
        va_start (ap, count);
        MethodSet res;
 
        va_start (ap, count);

-       res = NewSet;
+       res = NewMethodSet;

        for (int i = 0; i < count; i++) {
                Method item = va_arg (ap, Method);
                res->insert(item);
        for (int i = 0; i < count; i++) {
                Method item = va_arg (ap, Method);
                res->insert(item);


@@ -281,7 +281,7 @@ int main() {
        is2->insert(5);
 
 
        is2->insert(5);
 
 

-       MethodSet ms = NewSet;
+       MethodSet ms = NewMethodSet;

        Method m = new MethodCall;
        m->interfaceName = "Store";
        StateStruct *ss = new StateStruct;
        Method m = new MethodCall;
        m->interfaceName = "Store";
        StateStruct *ss = new StateStruct;