Minor consistency fixes wrt. piyacc.git commit 6558f0b

diff --git a/scan.l b/scan.l
index 690d987..42c5315 100644 (file)
--- a/scan.l
+++ b/scan.l
@@ -1624,7 +1624,7 @@ def markup_push(factory, *args, **kwargs):
 
 def markup_pop():
   global yy_element_space
-  _element = markup_stack.pop()
-  _element.append(yy_element_space)
-  #element.set_text(_element, len(_element), '')
-  yy_element_space = _element
+  _element = yy_element_space
+  yy_element_space = markup_stack.pop()
+  yy_element_space.append(_element)
+  #element.set_text(yy_element_space, len(yy_element_space), '')

diff --git a/skel/skel_py_element.py b/skel/skel_py_element.py
index 9c7e244..f1cccfa 100644 (file)
--- a/skel/skel_py_element.py
+++ b/skel/skel_py_element.py
@@ -316,17 +316,16 @@ def yylex(factory = element.Element, *args, **kwargs):
       raise Exception('scanner jammed')
 
     # append yy_element_token contents onto yy_element_space
-    i = len(yy_element_space)
     element.set_text(
       yy_element_space,
-      i,
-      element.get_text(yy_element_space, i) +
+      len(yy_element_space),
+      element.get_text(yy_element_space, len(yy_element_space)) +
       element.get_text(yy_element_token, 0)
     )
-    yy_element_space[i:] = yy_element_token[:]
+    yy_element_space[len(yy_element_space):] = yy_element_token[:]
  
     # clear yy_element_token for next yytext or EOF action
     element.set_text(yy_element_token, 0, '')
-    yy_element_token[:] = []
+    del yy_element_token[:]
 
 # GENERATE SECTION3