diff --git a/config/java_cup/.DS_Store b/config/java_cup/.DS_Store deleted file mode 100644 index f1611f4..0000000 Binary files a/config/java_cup/.DS_Store and /dev/null differ diff --git a/config/jflex/.DS_Store b/config/jflex/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/config/jflex/.DS_Store and /dev/null differ diff --git a/config/java_cup/ErrorManager.java b/config/modules/java_cup/ErrorManager.java similarity index 100% rename from config/java_cup/ErrorManager.java rename to config/modules/java_cup/ErrorManager.java diff --git a/config/java_cup/Lexer.java b/config/modules/java_cup/Lexer.java similarity index 100% rename from config/java_cup/Lexer.java rename to config/modules/java_cup/Lexer.java diff --git a/config/java_cup/Main.java b/config/modules/java_cup/Main.java similarity index 100% rename from config/java_cup/Main.java rename to config/modules/java_cup/Main.java diff --git a/config/java_cup/MainDrawTree.java b/config/modules/java_cup/MainDrawTree.java similarity index 100% rename from config/java_cup/MainDrawTree.java rename to config/modules/java_cup/MainDrawTree.java diff --git a/config/java_cup/action_part.java b/config/modules/java_cup/action_part.java similarity index 100% rename from config/java_cup/action_part.java rename to config/modules/java_cup/action_part.java diff --git a/config/java_cup/action_production.java b/config/modules/java_cup/action_production.java similarity index 100% rename from config/java_cup/action_production.java rename to config/modules/java_cup/action_production.java diff --git a/config/java_cup/anttask/CUPTask.java b/config/modules/java_cup/anttask/CUPTask.java similarity index 100% rename from config/java_cup/anttask/CUPTask.java rename to config/modules/java_cup/anttask/CUPTask.java diff --git a/config/java_cup/assoc.java b/config/modules/java_cup/assoc.java similarity index 100% rename from config/java_cup/assoc.java rename to config/modules/java_cup/assoc.java diff --git a/config/java_cup/emit.java b/config/modules/java_cup/emit.java similarity index 100% rename from config/java_cup/emit.java rename to config/modules/java_cup/emit.java diff --git a/config/java_cup/internal_error.java b/config/modules/java_cup/internal_error.java similarity index 100% rename from config/java_cup/internal_error.java rename to config/modules/java_cup/internal_error.java diff --git a/config/java_cup/lalr_item.java b/config/modules/java_cup/lalr_item.java similarity index 100% rename from config/java_cup/lalr_item.java rename to config/modules/java_cup/lalr_item.java diff --git a/config/java_cup/lalr_item_set.java b/config/modules/java_cup/lalr_item_set.java similarity index 100% rename from config/java_cup/lalr_item_set.java rename to config/modules/java_cup/lalr_item_set.java diff --git a/config/java_cup/lalr_state.java b/config/modules/java_cup/lalr_state.java similarity index 100% rename from config/java_cup/lalr_state.java rename to config/modules/java_cup/lalr_state.java diff --git a/config/java_cup/lalr_transition.java b/config/modules/java_cup/lalr_transition.java similarity index 100% rename from config/java_cup/lalr_transition.java rename to config/modules/java_cup/lalr_transition.java diff --git a/config/java_cup/lr_item_core.java b/config/modules/java_cup/lr_item_core.java similarity index 100% rename from config/java_cup/lr_item_core.java rename to config/modules/java_cup/lr_item_core.java diff --git a/config/java_cup/non_terminal.java b/config/modules/java_cup/non_terminal.java similarity index 100% rename from config/java_cup/non_terminal.java rename to config/modules/java_cup/non_terminal.java diff --git a/config/java_cup/nonassoc_action.java b/config/modules/java_cup/nonassoc_action.java similarity index 100% rename from config/java_cup/nonassoc_action.java rename to config/modules/java_cup/nonassoc_action.java diff --git a/config/java_cup/parse_action.java b/config/modules/java_cup/parse_action.java similarity index 100% rename from config/java_cup/parse_action.java rename to config/modules/java_cup/parse_action.java diff --git a/config/java_cup/parse_action_row.java b/config/modules/java_cup/parse_action_row.java similarity index 100% rename from config/java_cup/parse_action_row.java rename to config/modules/java_cup/parse_action_row.java diff --git a/config/java_cup/parse_action_table.java b/config/modules/java_cup/parse_action_table.java similarity index 100% rename from config/java_cup/parse_action_table.java rename to config/modules/java_cup/parse_action_table.java diff --git a/config/java_cup/parse_reduce_row.java b/config/modules/java_cup/parse_reduce_row.java similarity index 100% rename from config/java_cup/parse_reduce_row.java rename to config/modules/java_cup/parse_reduce_row.java diff --git a/config/java_cup/parse_reduce_table.java b/config/modules/java_cup/parse_reduce_table.java similarity index 100% rename from config/java_cup/parse_reduce_table.java rename to config/modules/java_cup/parse_reduce_table.java diff --git a/config/java_cup/parser.java b/config/modules/java_cup/parser.java similarity index 100% rename from config/java_cup/parser.java rename to config/modules/java_cup/parser.java diff --git a/config/java_cup/production.java b/config/modules/java_cup/production.java similarity index 100% rename from config/java_cup/production.java rename to config/modules/java_cup/production.java diff --git a/config/java_cup/production_part.java b/config/modules/java_cup/production_part.java similarity index 100% rename from config/java_cup/production_part.java rename to config/modules/java_cup/production_part.java diff --git a/config/java_cup/reduce_action.java b/config/modules/java_cup/reduce_action.java similarity index 100% rename from config/java_cup/reduce_action.java rename to config/modules/java_cup/reduce_action.java diff --git a/config/java_cup/runtime/ComplexSymbolFactory.java b/config/modules/java_cup/runtime/ComplexSymbolFactory.java similarity index 100% rename from config/java_cup/runtime/ComplexSymbolFactory.java rename to config/modules/java_cup/runtime/ComplexSymbolFactory.java diff --git a/config/java_cup/runtime/DefaultSymbolFactory.java b/config/modules/java_cup/runtime/DefaultSymbolFactory.java similarity index 100% rename from config/java_cup/runtime/DefaultSymbolFactory.java rename to config/modules/java_cup/runtime/DefaultSymbolFactory.java diff --git a/config/java_cup/runtime/Scanner.java b/config/modules/java_cup/runtime/Scanner.java similarity index 100% rename from config/java_cup/runtime/Scanner.java rename to config/modules/java_cup/runtime/Scanner.java diff --git a/config/java_cup/runtime/ScannerBuffer.java b/config/modules/java_cup/runtime/ScannerBuffer.java similarity index 100% rename from config/java_cup/runtime/ScannerBuffer.java rename to config/modules/java_cup/runtime/ScannerBuffer.java diff --git a/config/java_cup/runtime/Symbol.java b/config/modules/java_cup/runtime/Symbol.java similarity index 100% rename from config/java_cup/runtime/Symbol.java rename to config/modules/java_cup/runtime/Symbol.java diff --git a/config/java_cup/runtime/SymbolFactory.java b/config/modules/java_cup/runtime/SymbolFactory.java similarity index 100% rename from config/java_cup/runtime/SymbolFactory.java rename to config/modules/java_cup/runtime/SymbolFactory.java diff --git a/config/java_cup/runtime/SyntaxTreeDFS.java b/config/modules/java_cup/runtime/SyntaxTreeDFS.java similarity index 100% rename from config/java_cup/runtime/SyntaxTreeDFS.java rename to config/modules/java_cup/runtime/SyntaxTreeDFS.java diff --git a/config/java_cup/runtime/SyntaxTreeTransform.java b/config/modules/java_cup/runtime/SyntaxTreeTransform.java similarity index 100% rename from config/java_cup/runtime/SyntaxTreeTransform.java rename to config/modules/java_cup/runtime/SyntaxTreeTransform.java diff --git a/config/java_cup/runtime/SyntaxTreeXPath.java b/config/modules/java_cup/runtime/SyntaxTreeXPath.java similarity index 100% rename from config/java_cup/runtime/SyntaxTreeXPath.java rename to config/modules/java_cup/runtime/SyntaxTreeXPath.java diff --git a/config/java_cup/runtime/XMLElement.java b/config/modules/java_cup/runtime/XMLElement.java similarity index 100% rename from config/java_cup/runtime/XMLElement.java rename to config/modules/java_cup/runtime/XMLElement.java diff --git a/config/java_cup/runtime/lr_parser.java b/config/modules/java_cup/runtime/lr_parser.java similarity index 100% rename from config/java_cup/runtime/lr_parser.java rename to config/modules/java_cup/runtime/lr_parser.java diff --git a/config/java_cup/runtime/virtual_parse_stack.java b/config/modules/java_cup/runtime/virtual_parse_stack.java similarity index 100% rename from config/java_cup/runtime/virtual_parse_stack.java rename to config/modules/java_cup/runtime/virtual_parse_stack.java diff --git a/config/java_cup/shift_action.java b/config/modules/java_cup/shift_action.java similarity index 100% rename from config/java_cup/shift_action.java rename to config/modules/java_cup/shift_action.java diff --git a/config/java_cup/sym.java b/config/modules/java_cup/sym.java similarity index 100% rename from config/java_cup/sym.java rename to config/modules/java_cup/sym.java diff --git a/config/java_cup/symbol.java b/config/modules/java_cup/symbol.java similarity index 100% rename from config/java_cup/symbol.java rename to config/modules/java_cup/symbol.java diff --git a/config/java_cup/symbol_part.java b/config/modules/java_cup/symbol_part.java similarity index 100% rename from config/java_cup/symbol_part.java rename to config/modules/java_cup/symbol_part.java diff --git a/config/java_cup/symbol_set.java b/config/modules/java_cup/symbol_set.java similarity index 100% rename from config/java_cup/symbol_set.java rename to config/modules/java_cup/symbol_set.java diff --git a/config/java_cup/terminal.java b/config/modules/java_cup/terminal.java similarity index 100% rename from config/java_cup/terminal.java rename to config/modules/java_cup/terminal.java diff --git a/config/java_cup/terminal_set.java b/config/modules/java_cup/terminal_set.java similarity index 100% rename from config/java_cup/terminal_set.java rename to config/modules/java_cup/terminal_set.java diff --git a/config/java_cup/version.java b/config/modules/java_cup/version.java similarity index 100% rename from config/java_cup/version.java rename to config/modules/java_cup/version.java diff --git a/config/jflex/jflex-full-1.8.2.jar b/config/modules/jflex/jflex-full-1.8.2.jar similarity index 100% rename from config/jflex/jflex-full-1.8.2.jar rename to config/modules/jflex/jflex-full-1.8.2.jar diff --git a/config/win_makefile/Makefile b/config/win_makefile/Makefile new file mode 100644 index 0000000..cb9232a --- /dev/null +++ b/config/win_makefile/Makefile @@ -0,0 +1,24 @@ +build: lib scanner parser + javac -d build source/*.java + +lib: + javac -d build modules/java_cup/*.java + javac -d build modules/java_cup/runtime/*.java + +scanner: + java -classpath ./build -jar modules/jflex/jflex-full-1.8.2.jar source/scanner.jflex -d source + +parser: + java -classpath ./build java_cup.Main -destdir source -parser Parser source/parser.cup + +clean: + del /f/r/s source\*.java + del /f/r/s source\*.*~ + del /f/r/s build/* + +init: + mkdir source build modules + touch source/scanner.jflex source/parser.cup + +run: + java -classpath ./build Parser input.txt \ No newline at end of file diff --git a/windows/compdev.sh b/windows/compdev.sh index b8f2b99..eb7039f 100755 --- a/windows/compdev.sh +++ b/windows/compdev.sh @@ -70,11 +70,11 @@ then case $module in java_cup ) # add java_cup module into modules folder of the project - cp -r $config_path/java_cup ./modules/java_cup + cp -r $config_path/modules/java_cup ./modules/java_cup echo -e "\nDone. Module $module has been added in modules/ folder!\n" ;; jflex ) # add jflex module into modules folder of the project - cp -r $config_path/jflex ./modules/jflex + cp -r $config_path/modules/jflex ./modules/jflex echo -e "\nDone. Module $module has been added in modules/ folder!\n" ;; * ) # module passed is not found or it is not defined @@ -115,9 +115,9 @@ then mkdir $project/build $project/source $project/modules cp -r $config_path/scanner.jflex $project/source/scanner.jflex cp -r $config_path/parser.cup $project/source/parser.cup - cp -r $config_path/java_cup $project/modules/java_cup - cp -r $config_path/jflex $project/modules/jflex - cp $config_path/Makefile $project/Makefile + cp -r $config_path/modules/java_cup $project/modules/java_cup + cp -r $config_path/modules/jflex $project/modules/jflex + cp $config_path/win_makefile/Makefile $project/Makefile echo -e "\nDone. Your porject is now ready in $project/ folder!" echo "and start to develop your compiler." echo -e "\nHave you a good day!"