commit fe735bc79eaaaf332e5a77067db5a22c541b9aab
author Rich Lane <rlane@bigswitch.com> Mon Apr 08 16:58:49 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Mon Apr 08 17:51:55 2013 -0700
tree 17fa2b04cf4949944af6e2c27b7682e6c145f5fd
parent 60472de3c9ce630487fb8c07147f1d3de2f3e476

convert enum values to integers

Previously the enum values given to the backends were strings of C code.
Luckily the code was simple enough that it was also valid Python. Moving the
conversion to the frontend makes it easier to move enum definitions into the
input files, and cleans up some pyloxi code.

loxi_front_end/identifiers.py

diff --git a/loxi_front_end/identifiers.py b/loxi_front_end/identifiers.py
index 62759d7..0f35dc6 100644
--- a/loxi_front_end/identifiers.py
+++ b/loxi_front_end/identifiers.py
@@ -56,6 +56,7 @@
                        version, all_idents, idents_by_group)
 
 def add_identifier(name, ofp_name, ofp_group, value, version, all_idents, idents_by_group):
+    assert(isinstance(value, int))
     if name in all_idents:
         all_idents[name]["values_by_version"][version] = value
         if ((all_idents[name]["ofp_name"] != ofp_name or

loxi_front_end/of_h_utils.py

diff --git a/loxi_front_end/of_h_utils.py b/loxi_front_end/of_h_utils.py
index 26dbac1..ed70a55 100644
--- a/loxi_front_end/of_h_utils.py
+++ b/loxi_front_end/of_h_utils.py
@@ -101,9 +101,9 @@
     for enum in enum_list:
         (name, values) = c_parse_utils.extract_enum_vals(enum)
         for (ident, value) in values:
-            full_ident_list[ident] = str(value).strip()
+            full_ident_list[ident] = value
     for ident, value in defines_list:
-        full_ident_list[ident] = str(value).strip()
+        full_ident_list[ident] = value
 
     # Process enum idents
     for enum in enum_list:
@@ -123,7 +123,7 @@
             rv_list[loxi_name] = py_utils.DotDict(dict(
                 ofp_name = ident,
                 ofp_group = name,
-                value = value_str))
+                value = eval(value_str)))
 
     for ident, value in defines_list:
         loxi_name = translation.loxi_name(ident)
@@ -133,7 +133,7 @@
 
         value_str = fixup_values(ident, value, version, full_ident_list)
         if loxi_name in rv_list:
-            if value_str != rv_list[loxi_name].value:
+            if eval(value_str) != rv_list[loxi_name].value:
                 sys.stderr.write("""
 ERROR: IDENT COLLISION.  Version %s, LOXI Ident %s.
 New ofp_name %s, value %s.
@@ -148,7 +148,7 @@
         rv_list[loxi_name] = py_utils.DotDict(dict(
                 ofp_name = ident,
                 ofp_group = "macro_definitions",
-                value = value_str))
+                value = eval(value_str)))
 
     return rv_list
 

loxi_front_end/parser.py

diff --git a/loxi_front_end/parser.py b/loxi_front_end/parser.py
index 974e6cf..d79dd3c 100644
--- a/loxi_front_end/parser.py
+++ b/loxi_front_end/parser.py
@@ -36,6 +36,10 @@
 tag = lambda name: P.Empty().setParseAction(P.replaceWith(name))
 
 word = P.Word(P.alphanums + '_')
+integer = (
+            P.Combine('0x' - P.Word('0123456789abcdefABCDEF') |
+            P.Word('0123456789'))
+          ).setParseAction(lambda x: int(x[0], 0))
 
 identifier = word.copy().setName("identifier")
 
@@ -52,7 +56,7 @@
          s('}') - s(';')
 
 # Enums
-enum_member = P.Group(identifier + s('=') + P.Word(P.alphanums + '_'))
+enum_member = P.Group(identifier + s('=') + integer)
 enum_list = P.Forward()
 enum_list << enum_member + P.Optional(s(',') + P.Optional(enum_list))
 enum = kw('enum') - identifier - s('{') + \