diff options
| -rw-r--r-- | frontend/frontend.dcl | 11 | ||||
| -rw-r--r-- | frontend/frontend.icl | 135 | ||||
| -rw-r--r-- | frontend/scanner.dcl | 7 | ||||
| -rw-r--r-- | frontend/scanner.icl | 35 | ||||
| -rw-r--r-- | frontend/syntax.dcl | 3 | ||||
| -rw-r--r-- | frontend/syntax.icl | 3 |
6 files changed, 141 insertions, 53 deletions
diff --git a/frontend/frontend.dcl b/frontend/frontend.dcl index 7696b05..69d1626 100644 --- a/frontend/frontend.dcl +++ b/frontend/frontend.dcl @@ -14,6 +14,13 @@ import checksupport, transform, overloading , fe_globalFunctions :: !IndexRange , fe_arrayInstances :: !IndexRange } +:: FrontEndPhase + = FrontEndPhaseCheck + | FrontEndPhaseTypeCheck + | FrontEndPhaseConvertDynamics + | FrontEndPhaseTransformGroups + | FrontEndPhaseConvertModules + | FrontEndPhaseAll -frontEndInterface :: !Ident !SearchPaths !*PredefinedSymbols !*HashTable !*Files !*File !*File !*File -> (!*PredefinedSymbols, !*HashTable, !*Files, !*File, !*File, !*File, !Optional *FrontEndSyntaxTree) -// name paths predefs files error io out
\ No newline at end of file +frontEndInterface :: !FrontEndPhase !Ident !SearchPaths !*PredefinedSymbols !*HashTable !*Files !*File !*File !*File -> (!*PredefinedSymbols, !*HashTable, !*Files, !*File, !*File, !*File, !Optional *FrontEndSyntaxTree) +// upToPhase name paths predefs files error io out
\ No newline at end of file diff --git a/frontend/frontend.icl b/frontend/frontend.icl index 199359f..163dc44 100644 --- a/frontend/frontend.icl +++ b/frontend/frontend.icl @@ -19,8 +19,61 @@ import RWSDebug (-*->) value trace :== value // ---> trace -frontEndInterface :: !Ident !SearchPaths !*PredefinedSymbols !*HashTable !*Files !*File !*File !*File -> (!*PredefinedSymbols, !*HashTable, !*Files, !*File, !*File, !*File, !Optional *FrontEndSyntaxTree) -frontEndInterface mod_ident search_paths predef_symbols hash_table files error io out +frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances var_heap optional_dcl_icl_conversions + global_fun_range + :== (predef_symbols,hash_table,files,error,io,out, + Yes { fe_icl = {icl_mod & icl_functions=fun_defs } + , fe_dcls = dcl_mods + , fe_components = components + , fe_varHeap = var_heap + , fe_dclIclConversions = optional_dcl_icl_conversions + , fe_iclDclConversions = build_optional_icl_dcl_conversions (size fun_defs) optional_dcl_icl_conversions + , fe_globalFunctions = global_fun_range + , fe_arrayInstances = array_instances + } + ) + +build_optional_icl_dcl_conversions :: !Int !(Optional {# Index}) -> Optional {# Index} +build_optional_icl_dcl_conversions size No + = Yes (buildIclDclConversions size {}) +build_optional_icl_dcl_conversions size (Yes dcl_icl_conversions) + = Yes (buildIclDclConversions size dcl_icl_conversions) + +buildIclDclConversions :: !Int !{# Index} -> {# Index} +buildIclDclConversions table_size dcl_icl_conversions + # dcl_table_size = size dcl_icl_conversions + icl_dcl_conversions = update_conversion_array 0 dcl_table_size dcl_icl_conversions (createArray table_size NoIndex) + = fill_empty_positions 0 table_size dcl_table_size icl_dcl_conversions + +where + update_conversion_array dcl_index dcl_table_size dcl_icl_conversions icl_conversions + | dcl_index < dcl_table_size + # icl_index = dcl_icl_conversions.[dcl_index] + = update_conversion_array (inc dcl_index) dcl_table_size dcl_icl_conversions + { icl_conversions & [icl_index] = dcl_index } + = icl_conversions + + fill_empty_positions next_index table_size next_new_index icl_conversions + | next_index < table_size + | icl_conversions.[next_index] == NoIndex + = fill_empty_positions (inc next_index) table_size (inc next_new_index) { icl_conversions & [next_index] = next_new_index } + = fill_empty_positions (inc next_index) table_size next_new_index icl_conversions + = icl_conversions + +:: FrontEndPhase + = FrontEndPhaseCheck + | FrontEndPhaseTypeCheck + | FrontEndPhaseConvertDynamics + | FrontEndPhaseTransformGroups + | FrontEndPhaseConvertModules + | FrontEndPhaseAll + +instance == FrontEndPhase where + (==) a b + = equal_constructor a b + +frontEndInterface :: !FrontEndPhase !Ident !SearchPaths !*PredefinedSymbols !*HashTable !*Files !*File !*File !*File -> (!*PredefinedSymbols, !*HashTable, !*Files, !*File, !*File, !*File, !Optional *FrontEndSyntaxTree) +frontEndInterface upToPhase mod_ident search_paths predef_symbols hash_table files error io out # (ok, mod, hash_table, error, predef_symbols, files) = wantModule cWantIclFile mod_ident (hash_table -*-> ("Parsing:", mod_ident)) error search_paths predef_symbols files | not ok @@ -40,8 +93,16 @@ frontEndInterface mod_ident search_paths predef_symbols hash_table files error i dcl_mods = {{dcl_mod & dcl_declared={dcls_import=[],dcls_local=[],dcls_explicit=[]}}\\ dcl_mod<-:dcl_mods} - (ok, fun_defs, array_instances, type_code_instances, common_defs, imported_funs, heaps, predef_symbols, error) - = typeProgram (components -*-> "Typing") icl_functions icl_specials icl_common icl_declared.dcls_import dcl_mods heaps predef_symbols error + var_heap = heaps.hp_var_heap + fun_defs = icl_functions + array_instances = {ir_from=0, ir_to=0} + + | upToPhase == FrontEndPhaseCheck + = frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances + var_heap optional_dcl_icl_conversions global_fun_range + + # (ok, fun_defs, array_instances, type_code_instances, common_defs, imported_funs, heaps, predef_symbols, error) + = typeProgram (components -*-> "Typing") fun_defs icl_specials icl_common icl_declared.dcls_import dcl_mods heaps predef_symbols error | not ok = (predef_symbols, hash_table, files, error, io, out, No) @@ -50,21 +111,37 @@ frontEndInterface mod_ident search_paths predef_symbols hash_table files error i // (components, fun_defs, error) = showComponents components 0 True fun_defs error // (fun_defs, error) = showFunctions array_instances fun_defs error - (components, fun_defs, predef_symbols, dcl_types, used_conses_in_dynamics, var_heap, type_heaps, expression_heap) + | upToPhase == FrontEndPhaseTypeCheck + = frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances + heaps.hp_var_heap optional_dcl_icl_conversions global_fun_range + + # (components, fun_defs, predef_symbols, dcl_types, used_conses_in_dynamics, var_heap, type_heaps, expression_heap) = convertDynamicPatternsIntoUnifyAppls type_code_instances common_defs (components -*-> "convertDynamics") fun_defs predef_symbols heaps.hp_var_heap heaps.hp_type_heaps heaps.hp_expression_heap + | upToPhase == FrontEndPhaseConvertDynamics + = frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances + var_heap optional_dcl_icl_conversions global_fun_range + // (components, fun_defs, error) = showComponents components 0 True fun_defs error - (cleanup_info, acc_args, components, fun_defs, var_heap, expression_heap) + # (cleanup_info, acc_args, components, fun_defs, var_heap, expression_heap) = analyseGroups common_defs array_instances (components -*-> "Transform") fun_defs var_heap expression_heap (components, fun_defs, dcl_types, used_conses, var_heap, type_heaps, expression_heap) = transformGroups cleanup_info components fun_defs acc_args common_defs imported_funs dcl_types used_conses_in_dynamics var_heap type_heaps expression_heap - (dcl_types, used_conses, var_heap, type_heaps) = convertIclModule common_defs dcl_types used_conses var_heap type_heaps + + | upToPhase == FrontEndPhaseTransformGroups + = frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances + var_heap optional_dcl_icl_conversions global_fun_range + + # (dcl_types, used_conses, var_heap, type_heaps) = convertIclModule common_defs dcl_types used_conses var_heap type_heaps (dcl_types, used_conses, var_heap, type_heaps) = convertDclModule dcl_mods common_defs dcl_types used_conses var_heap type_heaps -// (components, fun_defs, out) = showComponents components 0 False fun_defs out + | upToPhase == FrontEndPhaseConvertModules + = frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances + var_heap optional_dcl_icl_conversions global_fun_range - (used_funs, components, fun_defs, dcl_types, used_conses, var_heap, type_heaps, expression_heap) +// (components, fun_defs, out) = showComponents components 0 False fun_defs out + # (used_funs, components, fun_defs, dcl_types, used_conses, var_heap, type_heaps, expression_heap) = convertCasesOfFunctionsIntoPatterns components imported_funs common_defs fun_defs dcl_types used_conses var_heap type_heaps expression_heap (dcl_types, type_heaps, var_heap) @@ -72,44 +149,8 @@ frontEndInterface mod_ident search_paths predef_symbols hash_table files error i // (components, fun_defs, error) = showTypes components 0 fun_defs error // (components, fun_defs, out) = showComponents components 0 False fun_defs out - = (predef_symbols,hash_table,files,error,io,out, - Yes { fe_icl = {icl_mod & icl_functions=fun_defs } - , fe_dcls = dcl_mods - , fe_components = components - , fe_varHeap = var_heap - , fe_dclIclConversions = optional_dcl_icl_conversions - , fe_iclDclConversions = build_optional_icl_dcl_conversions (size fun_defs) optional_dcl_icl_conversions - , fe_globalFunctions = global_fun_range - , fe_arrayInstances = array_instances - } - ) - where - - build_optional_icl_dcl_conversions :: !Int !(Optional {# Index}) -> Optional {# Index} - build_optional_icl_dcl_conversions size No - = Yes (build_icl_dcl_conversions size {}) - build_optional_icl_dcl_conversions size (Yes dcl_icl_conversions) - = Yes (build_icl_dcl_conversions size dcl_icl_conversions) - - build_icl_dcl_conversions :: !Int !{# Index} -> {# Index} - build_icl_dcl_conversions table_size dcl_icl_conversions - # dcl_table_size = size dcl_icl_conversions - icl_dcl_conversions = update_conversion_array 0 dcl_table_size dcl_icl_conversions (createArray table_size NoIndex) - = fill_empty_positions 0 table_size dcl_table_size icl_dcl_conversions - - update_conversion_array dcl_index dcl_table_size dcl_icl_conversions icl_conversions - | dcl_index < dcl_table_size - # icl_index = dcl_icl_conversions.[dcl_index] - = update_conversion_array (inc dcl_index) dcl_table_size dcl_icl_conversions - { icl_conversions & [icl_index] = dcl_index } - = icl_conversions - - fill_empty_positions next_index table_size next_new_index icl_conversions - | next_index < table_size - | icl_conversions.[next_index] == NoIndex - = fill_empty_positions (inc next_index) table_size (inc next_new_index) { icl_conversions & [next_index] = next_new_index } - = fill_empty_positions (inc next_index) table_size next_new_index icl_conversions - = icl_conversions + = frontSyntaxTree predef_symbols hash_table files error io out icl_mod dcl_mods fun_defs components array_instances + var_heap optional_dcl_icl_conversions global_fun_range newSymbolTable :: !Int -> *{# SymbolTableEntry} newSymbolTable size diff --git a/frontend/scanner.dcl b/frontend/scanner.dcl index dd00ae8..daa8bab 100644 --- a/frontend/scanner.dcl +++ b/frontend/scanner.dcl @@ -2,7 +2,12 @@ definition module scanner import StdEnv, general -:: SearchPaths :== [String] +// RWS Proof ... :: SearchPaths :== [String] +:: SearchPaths = + { sp_locations :: [(String, String)] // (module, path) + , sp_paths :: [String] + } +// ... RWS :: * ScanState diff --git a/frontend/scanner.icl b/frontend/scanner.icl index fca7784..6c01d52 100644 --- a/frontend/scanner.icl +++ b/frontend/scanner.icl @@ -14,7 +14,12 @@ functions names starting with '->' require a ';' after the type. Solutions: actual context of the new token or/and have to take care of generating the right amount of offsides. */ -:: SearchPaths :== [String] +// RWS Proof ... :: SearchPaths :== [String] +:: SearchPaths = + { sp_locations :: [(String, String)] // (module, path) + , sp_paths :: [String] + } +// ... RWS :: *ScanState = ScanState !RScanState @@ -1662,6 +1667,7 @@ openScanner file_name searchPaths files , files ) +/* RWS Proof ... fopenInSearchPaths :: !{#Char} [!{#Char}] !Int !*f -> (Optional *File,!*f) | FileSystem f fopenInSearchPaths fileName [] mode f = (No, f) @@ -1672,6 +1678,33 @@ fopenInSearchPaths fileName [path : paths] mode f = (Yes file, f) // otherwise = fopenInSearchPaths fileName paths mode f +*/ +fopenInSearchPaths :: !{#Char} SearchPaths !Int !*f -> (Optional *File,!*f) | FileSystem f +fopenInSearchPaths fileName searchPaths mode f + # filtered_locations + = filter (\(moduleName,path) -> moduleName == fileName) searchPaths.sp_locations + | isEmpty filtered_locations + = fopenAnywhereInSearchPaths fileName searchPaths.sp_paths mode f + # (_, path) + = hd filtered_locations + # (opened, file, f) + = fopen (path + fileName) mode f + | opened + = (Yes file, f) + | otherwise + = (No, f) + where + fopenAnywhereInSearchPaths :: !{#Char} ![{#Char}] !Int *f -> (Optional *File, !*f) | FileSystem f + fopenAnywhereInSearchPaths fileName [] mode f + = (No, f) + fopenAnywhereInSearchPaths fileName [path : paths] mode f + # (opened, file, f) + = fopen (path + fileName) mode f + | opened + = (Yes file, f) + // otherwise + = fopenAnywhereInSearchPaths fileName paths mode f +// ... RWS closeScanner :: !ScanState !*Files -> *Files closeScanner (ScanState scan_state) files = closeScanner_ scan_state files diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index 283669d..32adc25 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -464,7 +464,8 @@ cIsALocalVar :== False VI_Body !SymbIdent !TransformedBody ![FreeVar] | /* used during fusion */ VI_Dictionary !SymbIdent ![Expression] !Type | /* used during fusion */ VI_Extended !ExtendedVarInfo !VarInfo | - VI_Defined /* for marking type code variables during overloading */ | VI_LocallyDefined + VI_Defined /* for marking type code variables during overloading */ | VI_LocallyDefined | + VI_TheoremProverVariable !Int !Int /* MdM - first int is kind (0:parameter;1:case;2:let), second its index */ :: ExtendedVarInfo = EVI_VarType !AType diff --git a/frontend/syntax.icl b/frontend/syntax.icl index 643fbd3..2fb4020 100644 --- a/frontend/syntax.icl +++ b/frontend/syntax.icl @@ -439,7 +439,8 @@ cIsALocalVar :== False VI_Body !SymbIdent !TransformedBody ![FreeVar] | /* used during fusion */ VI_Dictionary !SymbIdent ![Expression] !Type | /* used during fusion */ VI_Extended !ExtendedVarInfo !VarInfo | - VI_Defined /* for marking type code variables during overloading */ | VI_LocallyDefined + VI_Defined /* for marking type code variables during overloading */ | VI_LocallyDefined | + VI_TheoremProverVariable !Int !Int /* MdM - first int is kind (0:parameter;1:case;2:let), second its index */ :: ExtendedVarInfo = EVI_VarType !AType |