Merge pull request #3 from dcvmoole/improved-mib-support

Various fixes and improvements regarding support of real-world MIBs

pysmi/codegen/base.py

@@ -5,8 +5,13 @@
 # License: https://www.pysnmp.com/pysmi/license.html
 #
 import sys
+from keyword import iskeyword
 from pysmi import error
 
+# Prefix added to symbols that happen to be Python keywords. The leading
+# underscore ensures that there is no overlap with any other symbols.
+RESERVED_KEYWORDS_PREFIX = "_pysmi_"
+
 
 def dorepr(s):
     return repr(s)
@@ -222,7 +227,7 @@ class AbstractCodeGen:
         "RFC1065-SMI": commonSyms["RFC1155-SMI/RFC1065-SMI"],
         "RFC1155-SMI": commonSyms["RFC1155-SMI/RFC1065-SMI"],
         "RFC1158-MIB": updateDict(
-            dict(commonSyms["RFC1155-SMI/RFC1065-SMI"]),
+            dict(commonSyms["RFC1158-MIB/RFC1213-MIB"]),
             (
                 ("nullSpecific", [("SNMPv2-SMI", "zeroDotZero")]),
                 ("ipRoutingTable", [("RFC1213-MIB", "ipRouteTable")]),
@@ -272,6 +277,13 @@ class AbstractCodeGen:
         "RFC-1215": {"TRAP-TYPE": [("SNMPv2-SMI", "TRAP-TYPE")]},
     }
 
+    smiv1IdxTypes = ["INTEGER", "OCTET STRING", "IpAddress", "NetworkAddress"]
+
+    # Name prefix and starting number of fake index object types, as generated
+    # the fly to support SMIv1-only index types (e.g., "INDEX { INTEGER }").
+    fakeIdxPrefix = "pysmiFakeCol"
+    fakeIdxNumber = 1
+
     def genCode(self, ast, symbolTable, **kwargs):
         raise NotImplementedError()
 
@@ -300,3 +312,9 @@ def str2int(self, s):
                 raise error.PySmiSemanticError("empty hex string to int conversion")
         else:
             return int(s)
+
+    @staticmethod
+    def transOpers(symbol):
+        if iskeyword(symbol):
+            symbol = RESERVED_KEYWORDS_PREFIX + symbol
+        return symbol.replace("-", "_")