Fix generic parser.

Author: takev

pyext/Makefile.am

@@ -1,3 +1,3 @@
 
-pkgpython_PYTHON = __init__.py
+pkgpython_PYTHON = __init__.py yyast.py Parser.py NodeInfo.py
 

pyext/__init__.py

@@ -0,0 +1,23 @@
+# Copyright (c) 2011-2013, Take Vos
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice, 
+#   this list of conditions and the following disclaimer in the documentation 
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+

pyext/parser.py

@@ -26,6 +26,14 @@
 import struct
 import NodeInfo
 
+def strip_null(x):
+    """Strip null bytes at the end of a string that is located in memory.
+    """
+    for i in range(len(x) -1, -1, -1):
+        if x[i] != '\0':
+            break
+    return x[0:i+1]
+
 class YYASTParserException (Exception):
     def __init__(self, message):
         Exeption.__init__(self, args=(message,))
@@ -82,6 +90,7 @@ def parse_branch_node(self, factory, node_info, internal_data):
         return node
 
     def parse_text_node(self, factory, node_info, internal_data):
+        internal_data = strip_null(internal_data)
         value = internal_data.decode("UTF-8")
         node = factory(node_info, value)
         node.parsing_done()
@@ -169,19 +178,22 @@ def parse_node(self, data):
         )
 
         # Get the factory class for the node.
-        factory = self.factories[node_name]
+        try:
+            factory = self.factories[node_name]
+        except KeyError:
+            raise YYASTParserException("Could not find factory for '%s' node" % node_name)
 
         try:
             subparser = self.subparsers[node_type]
         except KeyError:
-            raise YYASTParserException("Unknown node type %i.", node_type)
+            raise YYASTParserException("Unknown node type %i." % node_type)
 
         node = subparser(factory, node_info, internal_data)
         return node, rest_data
 
 
     def parse(self, fd):
-        m = mmap.mmap(fd.fileno(), 0)
+        m = mmap.mmap(fd.fileno(), 0, access=mmap.ACCESS_READ)
         node, rest_data = self.parse_node(m)
 
         if len(rest_data) != 0: