Better naming

Author: Timchenkovich

Diff for: asm/CMakeLists.txt

@@ -7,38 +7,38 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(BootstrapIsa)
 
 bootstrap_isa(${CMAKE_CURRENT_SOURCE_DIR}/asm.isa)
-set(ASM_INCLUDE_DIRS ${asm_GENERATED_DIR})
+set(ASM_GENERATED_INCLUDE_DIR ${asm_GENERATED_DIR})
 
 include_directories(
     module-context 
     ${ANTLR4_INCLUDE_DIRS} 
     func-creator
     source-descriptor
     ${SIM_PATH}
-    ${ASM_INCLUDE_DIRS}
+    ${ASM_GENERATED_INCLUDE_DIR}
 )
 
 # once instruction grammars are generated, initialize antlr generator chain
 antlr_target(
-    IsaLexer
+    IsaInstructionsLexer
     ${asm_INSTRUCTION_LEXER}
     LEXER
     OUTPUT_DIRECTORY ${asm_GENERATED_DIR}
-    DEPENDS generateInstructionGrammar ${asm_GRAMMAR_SOURCES} 
+    DEPENDS generateInstructionsGrammar ${asm_GRAMMAR_SOURCES} 
 )
 
 antlr_target(
     AsmLexer
     ${CMAKE_CURRENT_SOURCE_DIR}/asmLexer.g4
     LEXER
-    DEPENDS_ANTLR IsaLexer
+    DEPENDS_ANTLR IsaInstructionsLexer
     OUTPUT_DIRECTORY ${asm_GENERATED_DIR}
     COMPILE_FLAGS -lib ${asm_GENERATED_DIR}
 )
 
 
 antlr_target( 
-    IsaParser
+    IsaInstructionsParser
     ${asm_INSTRUCTION_PARSER}
     PARSER
     DEPENDS_ANTLR AsmLexer
@@ -52,7 +52,7 @@ antlr_target(
     PARSER
     LISTENER
     VISITOR
-    DEPENDS_ANTLR IsaParser
+    DEPENDS_ANTLR IsaInstructionsParser
     COMPILE_FLAGS -lib ${asm_GENERATED_DIR}
     OUTPUT_DIRECTORY ${asm_GENERATED_DIR}
 )

Diff for: asm/cmake/BootstrapIsa.cmake

@@ -19,17 +19,17 @@ macro(bootstrap_isa isaPathStr)
     endforeach()
 
 
-    set(${isaName}_INSTRUCTION_LEXER "${CMAKE_CURRENT_BINARY_DIR}/${outputDir}/${isaName}InstructionLexer.g4")
-    set(${isaName}_INSTRUCTION_PARSER "${CMAKE_CURRENT_BINARY_DIR}/${outputDir}/${isaName}InstructionParser.g4")
-    set(${isaName}_GRAMMAR_SOURCES ${${isaName}_INSTRUCTION_PARSER} ${${isaName}_INSTRUCTION_LEXER})
+    set(${isaName}_INSTRUCTIONS_LEXER "${CMAKE_CURRENT_BINARY_DIR}/${outputDir}/${isaName}InstructionLexer.g4")
+    set(${isaName}_INSTRUCTIONS_PARSER "${CMAKE_CURRENT_BINARY_DIR}/${outputDir}/${isaName}InstructionParser.g4")
+    set(${isaName}_INSTRUCTIONS_GRAMMAR_SOURCES ${${isaName}_INSTRUCTIONS_PARSER} ${${isaName}_INSTRUCTIONS_LEXER})
 
 
     add_custom_command(
     OUTPUT ${${isaName}_GENERATED_SOURCES} ${${isaName}_GRAMMAR_SOURCES}
     COMMAND mkdir -p ${outputDir} && cd ${outputDir} && ${CMAKE_BINARY_DIR}/asm/isa-creator/bootstrapIsa ${isaPath}
     DEPENDS ${CMAKE_BINARY_DIR}/asm/isa-creator/bootstrapIsa ${isaPath})
 
-    add_custom_target(generateInstructionGrammar DEPENDS ${${isaName}_GRAMMAR_SOURCES})
+    add_custom_target(generateInstructionGrammar DEPENDS ${${isaName}_INSTRUCTIONS_GRAMMAR_SOURCES})
 
     set(${isaName}_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}/${outputDir})
     set(${isaName}_ISA_SOURCES ${${isaName}_GENERATED_SOURCES})