Move grammar and tokens file to the pegparser.generator project

Author: otethal

graalpython/com.oracle.graal.python.pegparser.generator/Makefile

@@ -1,6 +1,7 @@
 QUIETLY$(MX_VERBOSE) = @
 
 PARSER_PATH ?= ../com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser
+INPUT_PATH ?= input_files
 ifdef MX_PYTHON
 PYTHON_EXE ?= ${MX_PYTHON}
 else ifdef MX_PYTHON_VERSION
@@ -9,22 +10,22 @@ else
 PYTHON_EXE ?= python3
 endif
 
-TARGET=${PARSER_PATH}/Parser.java
+PARSER_TARGET=${PARSER_PATH}/Parser.java
 
-GRAMMAR=${PARSER_PATH}/python.gram
-TOKENS=${PARSER_PATH}/Tokens
+GRAMMAR=${INPUT_PATH}/python.gram
+TOKENS=${INPUT_PATH}/Tokens
 
 PEGEN_FILES=$(shell find pegen pegjava -name '*.py')
 
-STAMP=${GRAMMAR}.stamp
+GRAMMAR_STAMP=${GRAMMAR}.stamp
 
 .PHONY: default clean
-default: ${STAMP}
+default: ${GRAMMAR_STAMP}
 
-${STAMP}: ${GRAMMAR} ${TOKENS} ${PEGEN_FILES} main_parser_gen.py
-	$(QUIETLY) ${PYTHON_EXE} main_parser_gen.py ${GRAMMAR} ${TOKENS} ${TARGET}
+${GRAMMAR_STAMP}: ${GRAMMAR} ${TOKENS} ${PEGEN_FILES} main_parser_gen.py
+	$(QUIETLY) ${PYTHON_EXE} main_parser_gen.py ${GRAMMAR} ${TOKENS} ${PARSER_TARGET}
 	$(QUIETLY) touch $@
 
 clean:
-	$(QUIETLY) rm -f ${TARGET}
-	$(QUIETLY) rm -f ${STAMP}
+	$(QUIETLY) rm -f ${PARSER_TARGET}
+	$(QUIETLY) rm -f ${GRAMMAR_STAMP}

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/Tokens renamed to graalpython/com.oracle.graal.python.pegparser.generator/input_files/Tokens

@@ -71,7 +71,7 @@ def main():
 
     with open(args.output_file, "w") as file:
         gen = JavaParserGenerator(grammar, all_tokens, exact_tokens, non_exact_tokens, file, debug=args.debug)
-        gen.generate(os.path.relpath(args.grammar_file, os.path.dirname(args.output_file)))
+        gen.generate(os.path.basename(args.grammar_file))
 
 
 if __name__ == '__main__':