diff options
| -rw-r--r-- | frontend/check.icl | 5 | ||||
| -rw-r--r-- | frontend/frontend.icl | 2 | ||||
| -rw-r--r-- | frontend/postparse.icl | 3 | ||||
| -rw-r--r-- | frontend/transform.icl | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/frontend/check.icl b/frontend/check.icl index 975ebec..ce4aa8b 100644 --- a/frontend/check.icl +++ b/frontend/check.icl @@ -16,7 +16,7 @@ convertIndex index table_index (Yes tables) = tables.[table_index].[index] convertIndex index table_index No = index - + getPredefinedGlobalSymbol :: !Index !Index !STE_Kind !Int !*CheckState -> (!Global DefinedSymbol, !*CheckState) getPredefinedGlobalSymbol symb_index module_index req_ste_kind arity cs=:{cs_predef_symbols,cs_symbol_table} # (pre_def_mod, cs_predef_symbols) = cs_predef_symbols![module_index] @@ -3335,6 +3335,3 @@ where | level == entry.ste_def_level = remove_defs_from_symbol_table level (inc from_index) to_index defs (symbol_table <:= (id_info, entry.ste_previous)) = remove_defs_from_symbol_table level (inc from_index) to_index defs symbol_table - - - diff --git a/frontend/frontend.icl b/frontend/frontend.icl index d9d17d8..41db653 100644 --- a/frontend/frontend.icl +++ b/frontend/frontend.icl @@ -16,7 +16,7 @@ import RWSDebug // trace macro (-*->) infixl (-*->) value trace - :== 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 diff --git a/frontend/postparse.icl b/frontend/postparse.icl index 2578f92..a5b0cf1 100644 --- a/frontend/postparse.icl +++ b/frontend/postparse.icl @@ -997,18 +997,15 @@ reorganiseLocalDefinitions [PD_TypeSpec pos1 name1 prio type specials : defs] ca reorganiseLocalDefinitions [] ca = ([], [], ca) - belongsToTypeSpec name prio new_name is_infix :== name == new_name && sameFixity prio is_infix - determineArity :: [ParsedExpr] (Optional SymbolType) -> Int determineArity args (Yes {st_arity}) = st_arity determineArity args No = length args - sameFixity :: Priority Bool -> Bool sameFixity (Prio _ _) is_infix = is_infix diff --git a/frontend/transform.icl b/frontend/transform.icl index 46caeb1..32f4a91 100644 --- a/frontend/transform.icl +++ b/frontend/transform.icl @@ -584,7 +584,7 @@ where expand_simple_macro mod_index macro_index macro=:{fun_body = CheckedBody body, fun_info, fun_symb, fun_pos} (macro_defs, modules, pi=:{pi_symbol_table,pi_symbol_heap,pi_var_heap,pi_error}) | macros_are_simple fun_info.fi_calls macro_defs - # identPos = newPosition fun_symb fun_pos + # identPos = newPosition fun_symb fun_pos ---> ("expanding", fun_symb) es = { es_symbol_table = pi_symbol_table, es_var_heap = pi_var_heap, es_symbol_heap = pi_symbol_heap, es_error = setErrorAdmin identPos pi_error } (tb_args, tb_rhs, local_vars, fi_calls, macro_defs, modules, {es_symbol_table, es_var_heap, es_symbol_heap, es_error}) |