Setuptools, python3, Cython compliance

.gitignore

@@ -4,3 +4,8 @@ build/
 src/pyrex/bison_.c
 src/pyrex/bison_.h
 
+bison.egg-info
+src/bison_.cpython-35m-x86_64-linux-gnu.so
+examples/java/javaparser.py
+dist/
+*.so

Makefile

@@ -1,15 +1,31 @@
+.PHONY: all module install clean develop java_test
+
+PYTHON=python
+
+JAVAS=javaparser.y javaparser.l 
+
 all: module
 
 module:
-	python2 setup.py build
+	$(PYTHON) setup.py build
 
 install:
-	python2 setup.py install
+	$(PYTHON) setup.py install
 
 clean:
+	$(PYTHON) setup.py clean
 	rm -rf *~ *.output tokens.h *.tab.* *.yy.c java-grammar new.* *.o *.so dummy build *.pxi *-lexer.c
 	rm -rf *-parser.y *-parser.c *-parser.h pybison.c pybison.h
 	rm -rf bison.c bison.h
 	rm -rf *.pyc
 	rm -rf tmp.*
 	rm -f src/pyrex/bison_.pxi src/pyrex/bison_.c src/pyrex/bison_.h
+	#rm -rf *.cpython-*.so
+
+develop:
+	$(PYTHON) setup.py develop
+
+
+java_test: develop 
+	cd examples/java && bison2py $(JAVAS) javaparser.py && $(PYTHON) run.py
+

__init__.py

@@ -1,4 +1,5 @@
-from src.python.node import BisonNode
-from src.python.bison import BisonParser, BisonSyntaxError
+from __future__ import absolute_import
+from .src.python.node import BisonNode
+from .src.python.bison import BisonParser, BisonSyntaxError
 
 __all__ = ['BisonNode', 'BisonParser', 'BisonSyntaxError']

doc/calc.py

@@ -2,7 +2,10 @@
 """
 A simple pybison parser program implementing a calculator
 """
+from __future__ import absolute_import
+from __future__ import print_function
 from bison import BisonParser
+from six.moves import input
 
 
 class Parser(BisonParser):
@@ -33,7 +36,7 @@ class Parser(BisonParser):
     # ------------------------------------------------------------------
     def read(self, nbytes):
         try:
-            return raw_input("> ") + "\n"
+            return input("> ") + "\n"
         except EOFError:
             return ''
 
@@ -63,7 +66,7 @@ def on_line(self, target, option, names, values):
              | exp NEWLINE
         """
         if option == 1:
-            print values[0]
+            print(values[0])
 
     def on_exp(self, target, option, names, values):
         """
@@ -109,7 +112,7 @@ def on_exp(self, target, option, names, values):
     extern void (*py_input)(PyObject *parser, char *buf, int *result,
                             int max_size);
     #define returntoken(tok) \
-            yylval = PyString_FromString(strdup(yytext)); return (tok);
+            yylval = PyUnicode_FromString(strdup(yytext)); return (tok);
     #define YY_INPUT(buf,result,max_size) { \
         (*py_input)(py_parser, buf, &result, max_size); \
     }

doc/walkthrough.html

@@ -208,7 +208,7 @@ <h3>1.3. Preparing Your Tokeniser File</h3>
     #include "tokens.h"
     extern void *py_parser;
     extern void (*py_input)(PyObject *parser, char *buf, int *result, int max_size);
-    #define returntoken(tok) yylval = PyString_FromString(strdup(yytext)); return (tok);
+    #define returntoken(tok) yylval = PyUnicode_FromString(strdup(yytext)); return (tok);
     #define YY_INPUT(buf,result,max_size) {(*py_input)(py_parser, buf, &result, max_size);}
     }%</pre></b>
 
@@ -257,7 +257,7 @@ <h3>1.3. Preparing Your Tokeniser File</h3>
     </blockquote>
 
     <b><pre>
-    #define returntoken(tok) yylval = PyString_FromString(strdup(yytext)); return (tok);</pre></b>
+    #define returntoken(tok) yylval = PyUnicode_FromString(strdup(yytext)); return (tok);</pre></b>
 
     A macro which wraps all tokens values as Python strings, so your parser target handlers can uplift
     the original input text which constitutes that token.
@@ -685,15 +685,15 @@ <h3>2.8. Add Flex Script</h3>
 
     <b><pre>
     %{
-    int yylineno = 0;
+    int yylineno = 0; // Remove if engine fails to build.
     #include &lt;stdio.h&gt;
     #include &lt;string.h&gt;
     #include "Python.h"
     #define YYSTYPE void *
     #include "tokens.h"
     extern void *py_parser;
     extern void (*py_input)(PyObject *parser, char *buf, int *result, int max_size);
-    #define returntoken(tok) yylval = PyString_FromString(strdup(yytext)); return (tok);
+    #define returntoken(tok) yylval = PyUnicode_FromString(strdup(yytext)); return (tok);
     #define YY_INPUT(buf,result,max_size) { (*py_input)(py_parser, buf, &result, max_size); }
     %}
     </pre></b>
@@ -770,15 +770,15 @@ <h3>2.8. Add Flex Script</h3>
 
         lexscript = r"""
     %{
-    int yylineno = 0;
+    int yylineno = 0; // Remove if engine fails to build.
     #include &lt;stdio.h&gt;
     #include &lt;string.h&gt;
     #include "Python.h"
     #define YYSTYPE void *
     #include "tokens.h"
     extern void *py_parser;
     extern void (*py_input)(PyObject *parser, char *buf, int *result, int max_size);
-    #define returntoken(tok) yylval = PyString_FromString(strdup(yytext)); return (tok);
+    #define returntoken(tok) yylval = PyUnicode_FromString(strdup(yytext)); return (tok);
     #define YY_INPUT(buf,result,max_size) { (*py_input)(py_parser, buf, &result, max_size); }
     %}
 

examples/C/c.l

@@ -11,15 +11,15 @@ IS			(u|U|l|L)*
 /* this scanner sourced from: http://www.lysator.liu.se/c/ANSI-C-grammar-l.html */
 
 void count();
-int yylineno = 0;
+//int yylineno = 0;
 #include <stdio.h>
 #include <string.h>
 #include "Python.h"
 #define YYSTYPE void *
 #include "tokens.h"
 extern void *py_parser;
 extern void (*py_input)(PyObject *parser, char *buf, int *result, int max_size);
-#define returntoken(tok) /*printf("%d=%s\n", tok, yytext);*/ yylval = PyString_FromString(strdup(yytext)); return (tok);
+#define returntoken(tok) /*printf("%d=%s\n", tok, yytext);*/ yylval = PyUnicode_FromString(strdup(yytext)); return (tok);
 #define YY_INPUT(buf,result,max_size) { (*py_input)(py_parser, buf, &result, max_size); }
 
 %}