Changeset c6856ffe in OpenModelica

Timestamp:

2020-10-21T14:04:15+02:00 (3 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

a44b408

Parents:

df6240e

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (07/12/20 20:34:30)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:15)

Message:

[cmake] Add OMParser to compilation.

• Uses two macros for generating the C files from the antlr sources. One is used for antlr files that depend on base_modelica_lexer. The other is used for only Modelica.g right now.

Location:

OMCompiler

Files:

• CMakeLists.txt (modified) (1 diff)
• Parser/CMakeLists.txt (modified) (4 diffs)
• Parser/Parser_omc.c (modified) (1 diff)
• Parser/parse.c (modified) (1 diff)

OMCompiler/CMakeLists.txt

@@ -16 +16 @@
 omc_add_subdirectory(SimulationRuntime)
 omc_add_subdirectory(Compiler)
-# omc_add_subdirectory(Parser)
+omc_add_subdirectory(Parser)
 
 

OMCompiler/Parser/CMakeLists.txt

@@ -30 +30 @@
 endfunction(ADD_ANTLR_GRAMMAR_TARGET)
 
-function(ADD_ANTLR_LEXER_TARGET input_file output_dir)
+
+macro(ADD_ANTLR_BASE_LEXER_TARGET input_file output_dir src_list)
 
   get_filename_component(file_name_no_ext ${input_file} NAME_WE)
   set(output_file_path_no_ext ${output_dir}/${file_name_no_ext})
+  set(output_file_base_path_no_ext ${output_dir}/${file_name_no_ext}_BaseModelica_Lexer)
 
   add_custom_command(
-    DEPENDS ${input_file}
+    DEPENDS ${input_file} ${CMAKE_CURRENT_SOURCE_DIR}/BaseModelica_Lexer.g
     SOURCE ${input_file}
     COMMAND ${Java_JAVA_EXECUTABLE}
@@ -43 +45 @@
           -o ${output_dir}
           ${input_file}
-    COMMENT "Generating ${output_file_path_no_ext}.c/h for ANTLR file ${input_file}."
+    COMMENT "Generating ${output_file_path_no_ext}.c/h and ${output_file_base_path_no_ext}.c/h for ANTLR file ${input_file}."
     OUTPUT ${output_file_path_no_ext}.c
     OUTPUT ${output_file_path_no_ext}.h
+    OUTPUT ${output_file_base_path_no_ext}.c
+    OUTPUT ${output_file_base_path_no_ext}.h
   )
   set_source_files_properties(${output_file_path_no_ext}.c GENERATED)
   set_source_files_properties(${output_file_path_no_ext}.h GENERATED)
+  set_source_files_properties(${output_file_base_path_no_ext}.c GENERATED)
+  set_source_files_properties(${output_file_base_path_no_ext}.h GENERATED)
+
+  set(LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS ${output_file_path_no_ext}.c ${output_file_base_path_no_ext}.c)
+  # message(STATUS ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
+
   message(STATUS "added antrl target ${output_file_path_no_ext}")
-endfunction(ADD_ANTLR_LEXER_TARGET)
+endmacro(ADD_ANTLR_BASE_LEXER_TARGET)
+
+
+set(OM_PARSE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Parser_omc.c)
 
 
@@ -56 +69 @@
 file(MAKE_DIRECTORY ${GNERATED_DIRECTORY})
 
-# ADD_ANTLR_GRAMMAR_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica.g ${GNERATED_DIRECTORY})
-# set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${GNERATED_DIRECTORY}/ModelicaParser.c)
+ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica_3_Lexer.g ${GNERATED_DIRECTORY} OM_PARSE_SOURCES)
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
 
-ADD_ANTLR_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica_3_Lexer.g ${GNERATED_DIRECTORY})
+ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/ParModelica_Lexer.g ${GNERATED_DIRECTORY} ${OM_PARSE_SOURCES})
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
+
+ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/MetaModelica_Lexer.g ${GNERATED_DIRECTORY} ${OM_PARSE_SOURCES})
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
+
+ADD_ANTLR_GRAMMAR_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica.g ${GNERATED_DIRECTORY})
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${GNERATED_DIRECTORY}/ModelicaParser.c)
+
+message(STATUS ${OM_PARSE_SOURCES})
 
 
-# set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${GNERATED_DIRECTORY}/*.c)
-file(GLOB OM_PARSE_SOURCES ${GNERATED_DIRECTORY}/*.c)
-
-
-add_library(omparse SHARED ${OM_PARSE_SOURCES})
+######################### add libomparser ###########################
+add_library(omparse STATIC ${OM_PARSE_SOURCES})
 target_link_libraries(omparse PUBLIC omantlr3)
 target_link_libraries(omparse PUBLIC OpenModelicaRuntimeC)
@@ -79 +98 @@
 target_include_directories(omparse PUBLIC ${SimulationRuntimeC_SOURCE_DIR}) #for openmodelica.h :/
 target_include_directories(omparse PUBLIC ${OMCompiler_SOURCE_DIR}) #for revision.h, openmodelica.h :/
+######################### end libomparser ###########################
+
+
+######################### add libomparser-boot ###########################
+add_library(omparse-boot STATIC ${OM_PARSE_SOURCES})
+target_link_libraries(omparse-boot PUBLIC omantlr3)
+target_link_libraries(omparse-boot PUBLIC OpenModelicaRuntimeC)
+
+# Define OMC_BOOTSTRAPPING for the boot lib.
+target_compile_definitions(omparse-boot PRIVATE OMC_BOOTSTRAPPING)
+
+# # to find the generated antlr headers
+# # SYSTEM to disable warnings on the generated code.
+# target_include_directories(omparse SYSTEM PRIVATE ${GNERATED_DIRECTORY})
+target_include_directories(omparse-boot PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_include_directories(omparse-boot PUBLIC ${OMCompiler_SOURCE_DIR}/Compiler) #for OpenModelicaBootstrappingHeader.h :/
+target_include_directories(omparse-boot PUBLIC ${OMCompiler_SOURCE_DIR}/Compiler/runtime) #for systemimpl.h :/
+target_include_directories(omparse-boot PUBLIC ${SimulationRuntimeC_SOURCE_DIR}) #for openmodelica.h :/
+target_include_directories(omparse-boot PUBLIC ${OMCompiler_SOURCE_DIR}) #for revision.h
+######################### end libomparser-boot ###########################

OMCompiler/Parser/Parser_omc.c

@@ -34 +34 @@
 #endif
 
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #include "parse.c"
 

OMCompiler/Parser/parse.c

@@ -46 +46 @@
 #include "errorext.h"
 #include "systemimpl.h"
-#include "omc_file.h"
+#include "util/omc_file.h"
 
 pthread_once_t parser_once_create_key = PTHREAD_ONCE_INIT;