diff options
| author | ronny | 2003-03-13 14:10:27 +0000 |
|---|---|---|
| committer | ronny | 2003-03-13 14:10:27 +0000 |
| commit | 503379a47730c3e89101482dd9fedc1cef64e252 (patch) | |
| tree | cb963868aa78ee45b662a2d5c1b111d6fea3b33b | |
| parent | - added some missing alternatives to toString (Token), fixes bug #12 (diff) | |
removed _TypePatternVar constructor from TypeCode
The distinction between TypePatternVars and TypeVars is not really
necessary.
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1331 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
| -rw-r--r-- | frontend/check.icl | 2 | ||||
| -rw-r--r-- | frontend/convertDynamics.icl | 3 | ||||
| -rw-r--r-- | frontend/predef.dcl | 2 | ||||
| -rw-r--r-- | frontend/predef.icl | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/frontend/check.icl b/frontend/check.icl index f3ee37a..062fc59 100644 --- a/frontend/check.icl +++ b/frontend/check.icl @@ -3445,7 +3445,7 @@ where <=< adjustPredefSymbol PD_Dyn_TypeCons mod_index STE_Constructor <=< adjustPredefSymbol PD_Dyn_TypeApp mod_index STE_Constructor <=< adjustPredefSymbol PD_Dyn_TypeVar mod_index STE_Constructor - <=< adjustPredefSymbol PD_Dyn_TypePatternVar mod_index STE_Constructor +// <=< adjustPredefSymbol PD_Dyn_TypePatternVar mod_index STE_Constructor <=< adjustPredefSymbol PD_Dyn_UnificationEnvironment mod_index STE_Type <=< adjustPredefSymbol PD_Dyn_initial_unification_environment mod_index STE_DclFunction <=< adjustPredefSymbol PD_Dyn_bind_global_type_pattern_var mod_index STE_DclFunction diff --git a/frontend/convertDynamics.icl b/frontend/convertDynamics.icl index 7ab260a..9123b39 100644 --- a/frontend/convertDynamics.icl +++ b/frontend/convertDynamics.icl @@ -744,7 +744,8 @@ convertTypeCode pattern cinp (TCE_Selector selections var_info_ptr) st createTypePatternVariable :: !*ConversionState -> (!Expression, !*ConversionState) createTypePatternVariable ci # (tpv_symb, ci) - = getSymbol PD_Dyn_TypePatternVar SK_Constructor 1 ci +// = getSymbol PD_Dyn_TypePatternVar SK_Constructor 1 ci + = getSymbol PD_Dyn_TypeVar SK_Constructor 1 ci = (App { app_symb = tpv_symb, app_args = [BasicExpr (BVInt ci.ci_type_pattern_var_count)], app_info_ptr = nilPtr }, diff --git a/frontend/predef.dcl b/frontend/predef.dcl index 2450e8d..7d7f5c7 100644 --- a/frontend/predef.dcl +++ b/frontend/predef.dcl @@ -141,7 +141,7 @@ PD_Dyn_Type :== 164 PD_Dyn_TypeScheme :== 165 PD_Dyn_TypeApp :== 166 PD_Dyn_TypeVar :== 167 -PD_Dyn_TypePatternVar :== 168 +// PD_Dyn_TypePatternVar :== 168 PD_Dyn_TypeCons :== 169 // unification PD_Dyn_UnificationEnvironment :== 170 diff --git a/frontend/predef.icl b/frontend/predef.icl index c9abb76..49854b8 100644 --- a/frontend/predef.icl +++ b/frontend/predef.icl @@ -105,7 +105,7 @@ predefined_idents [PD_Dyn_TypeApp] = i "TypeApp", [PD_Dyn_TypeVar] = i "TypeVar", [PD_Dyn_TypeCons] = i "TypeCons", - [PD_Dyn_TypePatternVar] = i "_TypePatternVar", +// [PD_Dyn_TypePatternVar] = i "_TypePatternVar", [PD_Dyn_UnificationEnvironment] = i "_UnificationEnvironment", [PD_Dyn_initial_unification_environment] = i "_initial_unification_environment", [PD_Dyn_bind_global_type_pattern_var] = i "_bind_global_type_pattern_var", @@ -334,7 +334,7 @@ where <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypeScheme) <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypeApp) <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypeVar) - <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypePatternVar) +// <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypePatternVar) <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypeCons) <<- (local_predefined_idents, IC_Type, PD_Dyn_UnificationEnvironment) <<- (local_predefined_idents, IC_Expression, PD_Dyn_unify) |