Modules and Windows Makefile

Modules moved into config/modules/ folder and Makefile for Windows added
andrea-deluca · May 12, 2022 · bfcbdbc · bfcbdbc
1 parent f9918c8
commit bfcbdbc
Show file tree

Hide file tree

Showing 51 changed files with 29 additions and 5 deletions.
diff --git a/config/java_cup/.DS_Store b/config/java_cup/.DS_Store
diff --git a/config/jflex/.DS_Store b/config/jflex/.DS_Store
diff --git a/config/java_cup/ErrorManager.java → config/modules/java_cup/ErrorManager.java b/config/java_cup/ErrorManager.java → config/modules/java_cup/ErrorManager.java
diff --git a/config/java_cup/Lexer.java → config/modules/java_cup/Lexer.java b/config/java_cup/Lexer.java → config/modules/java_cup/Lexer.java
diff --git a/config/java_cup/Main.java → config/modules/java_cup/Main.java b/config/java_cup/Main.java → config/modules/java_cup/Main.java
diff --git a/config/java_cup/MainDrawTree.java → config/modules/java_cup/MainDrawTree.java b/config/java_cup/MainDrawTree.java → config/modules/java_cup/MainDrawTree.java
diff --git a/config/java_cup/action_part.java → config/modules/java_cup/action_part.java b/config/java_cup/action_part.java → config/modules/java_cup/action_part.java
diff --git a/config/java_cup/action_production.java → ...g/modules/java_cup/action_production.java b/config/java_cup/action_production.java → ...g/modules/java_cup/action_production.java
diff --git a/config/java_cup/anttask/CUPTask.java → config/modules/java_cup/anttask/CUPTask.java b/config/java_cup/anttask/CUPTask.java → config/modules/java_cup/anttask/CUPTask.java
diff --git a/config/java_cup/assoc.java → config/modules/java_cup/assoc.java b/config/java_cup/assoc.java → config/modules/java_cup/assoc.java
diff --git a/config/java_cup/emit.java → config/modules/java_cup/emit.java b/config/java_cup/emit.java → config/modules/java_cup/emit.java
diff --git a/config/java_cup/internal_error.java → config/modules/java_cup/internal_error.java b/config/java_cup/internal_error.java → config/modules/java_cup/internal_error.java
diff --git a/config/java_cup/lalr_item.java → config/modules/java_cup/lalr_item.java b/config/java_cup/lalr_item.java → config/modules/java_cup/lalr_item.java
diff --git a/config/java_cup/lalr_item_set.java → config/modules/java_cup/lalr_item_set.java b/config/java_cup/lalr_item_set.java → config/modules/java_cup/lalr_item_set.java
diff --git a/config/java_cup/lalr_state.java → config/modules/java_cup/lalr_state.java b/config/java_cup/lalr_state.java → config/modules/java_cup/lalr_state.java
diff --git a/config/java_cup/lalr_transition.java → config/modules/java_cup/lalr_transition.java b/config/java_cup/lalr_transition.java → config/modules/java_cup/lalr_transition.java
diff --git a/config/java_cup/lr_item_core.java → config/modules/java_cup/lr_item_core.java b/config/java_cup/lr_item_core.java → config/modules/java_cup/lr_item_core.java
diff --git a/config/java_cup/non_terminal.java → config/modules/java_cup/non_terminal.java b/config/java_cup/non_terminal.java → config/modules/java_cup/non_terminal.java
diff --git a/config/java_cup/nonassoc_action.java → config/modules/java_cup/nonassoc_action.java b/config/java_cup/nonassoc_action.java → config/modules/java_cup/nonassoc_action.java
diff --git a/config/java_cup/parse_action.java → config/modules/java_cup/parse_action.java b/config/java_cup/parse_action.java → config/modules/java_cup/parse_action.java
diff --git a/config/java_cup/parse_action_row.java → ...ig/modules/java_cup/parse_action_row.java b/config/java_cup/parse_action_row.java → ...ig/modules/java_cup/parse_action_row.java
diff --git a/config/java_cup/parse_action_table.java → .../modules/java_cup/parse_action_table.java b/config/java_cup/parse_action_table.java → .../modules/java_cup/parse_action_table.java
diff --git a/config/java_cup/parse_reduce_row.java → ...ig/modules/java_cup/parse_reduce_row.java b/config/java_cup/parse_reduce_row.java → ...ig/modules/java_cup/parse_reduce_row.java
diff --git a/config/java_cup/parse_reduce_table.java → .../modules/java_cup/parse_reduce_table.java b/config/java_cup/parse_reduce_table.java → .../modules/java_cup/parse_reduce_table.java
diff --git a/config/java_cup/parser.java → config/modules/java_cup/parser.java b/config/java_cup/parser.java → config/modules/java_cup/parser.java
diff --git a/config/java_cup/production.java → config/modules/java_cup/production.java b/config/java_cup/production.java → config/modules/java_cup/production.java
diff --git a/config/java_cup/production_part.java → config/modules/java_cup/production_part.java b/config/java_cup/production_part.java → config/modules/java_cup/production_part.java
diff --git a/config/java_cup/reduce_action.java → config/modules/java_cup/reduce_action.java b/config/java_cup/reduce_action.java → config/modules/java_cup/reduce_action.java
diff --git a/...ava_cup/runtime/ComplexSymbolFactory.java → ...ava_cup/runtime/ComplexSymbolFactory.java b/...ava_cup/runtime/ComplexSymbolFactory.java → ...ava_cup/runtime/ComplexSymbolFactory.java
diff --git a/...ava_cup/runtime/DefaultSymbolFactory.java → ...ava_cup/runtime/DefaultSymbolFactory.java b/...ava_cup/runtime/DefaultSymbolFactory.java → ...ava_cup/runtime/DefaultSymbolFactory.java
diff --git a/config/java_cup/runtime/Scanner.java → config/modules/java_cup/runtime/Scanner.java b/config/java_cup/runtime/Scanner.java → config/modules/java_cup/runtime/Scanner.java
diff --git a/config/java_cup/runtime/ScannerBuffer.java → ...dules/java_cup/runtime/ScannerBuffer.java b/config/java_cup/runtime/ScannerBuffer.java → ...dules/java_cup/runtime/ScannerBuffer.java
diff --git a/config/java_cup/runtime/Symbol.java → config/modules/java_cup/runtime/Symbol.java b/config/java_cup/runtime/Symbol.java → config/modules/java_cup/runtime/Symbol.java
diff --git a/config/java_cup/runtime/SymbolFactory.java → ...dules/java_cup/runtime/SymbolFactory.java b/config/java_cup/runtime/SymbolFactory.java → ...dules/java_cup/runtime/SymbolFactory.java
diff --git a/config/java_cup/runtime/SyntaxTreeDFS.java → ...dules/java_cup/runtime/SyntaxTreeDFS.java b/config/java_cup/runtime/SyntaxTreeDFS.java → ...dules/java_cup/runtime/SyntaxTreeDFS.java
diff --git a/...java_cup/runtime/SyntaxTreeTransform.java → ...java_cup/runtime/SyntaxTreeTransform.java b/...java_cup/runtime/SyntaxTreeTransform.java → ...java_cup/runtime/SyntaxTreeTransform.java
diff --git a/config/java_cup/runtime/SyntaxTreeXPath.java → ...les/java_cup/runtime/SyntaxTreeXPath.java b/config/java_cup/runtime/SyntaxTreeXPath.java → ...les/java_cup/runtime/SyntaxTreeXPath.java
diff --git a/config/java_cup/runtime/XMLElement.java → .../modules/java_cup/runtime/XMLElement.java b/config/java_cup/runtime/XMLElement.java → .../modules/java_cup/runtime/XMLElement.java
diff --git a/config/java_cup/runtime/lr_parser.java → ...g/modules/java_cup/runtime/lr_parser.java b/config/java_cup/runtime/lr_parser.java → ...g/modules/java_cup/runtime/lr_parser.java
diff --git a/...java_cup/runtime/virtual_parse_stack.java → ...java_cup/runtime/virtual_parse_stack.java b/...java_cup/runtime/virtual_parse_stack.java → ...java_cup/runtime/virtual_parse_stack.java
diff --git a/config/java_cup/shift_action.java → config/modules/java_cup/shift_action.java b/config/java_cup/shift_action.java → config/modules/java_cup/shift_action.java
diff --git a/config/java_cup/sym.java → config/modules/java_cup/sym.java b/config/java_cup/sym.java → config/modules/java_cup/sym.java
diff --git a/config/java_cup/symbol.java → config/modules/java_cup/symbol.java b/config/java_cup/symbol.java → config/modules/java_cup/symbol.java
diff --git a/config/java_cup/symbol_part.java → config/modules/java_cup/symbol_part.java b/config/java_cup/symbol_part.java → config/modules/java_cup/symbol_part.java
diff --git a/config/java_cup/symbol_set.java → config/modules/java_cup/symbol_set.java b/config/java_cup/symbol_set.java → config/modules/java_cup/symbol_set.java
diff --git a/config/java_cup/terminal.java → config/modules/java_cup/terminal.java b/config/java_cup/terminal.java → config/modules/java_cup/terminal.java
diff --git a/config/java_cup/terminal_set.java → config/modules/java_cup/terminal_set.java b/config/java_cup/terminal_set.java → config/modules/java_cup/terminal_set.java
diff --git a/config/java_cup/version.java → config/modules/java_cup/version.java b/config/java_cup/version.java → config/modules/java_cup/version.java
diff --git a/config/jflex/jflex-full-1.8.2.jar → config/modules/jflex/jflex-full-1.8.2.jar b/config/jflex/jflex-full-1.8.2.jar → config/modules/jflex/jflex-full-1.8.2.jar
diff --git a/config/win_makefile/Makefile 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
diff --git 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!"