diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/check.icl | 7 | ||||
| -rw-r--r-- | frontend/predef.dcl | 206 | ||||
| -rw-r--r-- | frontend/predef.icl | 10 |
3 files changed, 113 insertions, 110 deletions
diff --git a/frontend/check.icl b/frontend/check.icl index 062fc59..32c1bdd 100644 --- a/frontend/check.icl +++ b/frontend/check.icl @@ -3440,12 +3440,13 @@ where | pre_mod.pds_def == mod_index = (class_members, class_instances, fun_types, { cs & cs_predef_symbols = cs_predef_symbols} <=< adjustPredefSymbol PD_Dyn_DynamicTemp mod_index STE_Type - <=< adjustPredefSymbol PD_Dyn_Type mod_index STE_Type + <=< adjustPredefSymbol PD_Dyn_TypeCode mod_index STE_Type <=< adjustPredefSymbol PD_Dyn_TypeScheme mod_index STE_Constructor + <=< adjustPredefSymbol PD_Dyn_TypeVar mod_index STE_Constructor <=< 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_TypeUnique mod_index STE_Constructor + <=< adjustPredefSymbol PD_Dyn__TypeFixedVar 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/predef.dcl b/frontend/predef.dcl index 7d7f5c7..84f185a 100644 --- a/frontend/predef.dcl +++ b/frontend/predef.dcl @@ -137,117 +137,117 @@ PD_StdDynamic :== 162 // dynamic type PD_Dyn_DynamicTemp :== 163 // type code -PD_Dyn_Type :== 164 +PD_Dyn_TypeCode :== 164 PD_Dyn_TypeScheme :== 165 PD_Dyn_TypeApp :== 166 PD_Dyn_TypeVar :== 167 -// PD_Dyn_TypePatternVar :== 168 -PD_Dyn_TypeCons :== 169 +PD_Dyn_TypeCons :== 168 +PD_Dyn_TypeUnique :== 169 +PD_Dyn__TypeFixedVar :== 170 // unification -PD_Dyn_UnificationEnvironment :== 170 -PD_Dyn_initial_unification_environment :== 171 -PD_Dyn_bind_global_type_pattern_var :== 172 -PD_Dyn_unify :== 173 -PD_Dyn_normalise :== 174 +PD_Dyn_UnificationEnvironment :== 171 +PD_Dyn_initial_unification_environment :== 172 +PD_Dyn_bind_global_type_pattern_var :== 173 +PD_Dyn_unify :== 174 +PD_Dyn_normalise :== 175 // predefined type code constructor -PD_Dyn_TypeCodeConstructorInt :== 175 -PD_Dyn_TypeCodeConstructorChar :== 176 -PD_Dyn_TypeCodeConstructorReal :== 177 -PD_Dyn_TypeCodeConstructorBool :== 178 -PD_Dyn_TypeCodeConstructorDynamic :== 179 -PD_Dyn_TypeCodeConstructorFile :== 180 -PD_Dyn_TypeCodeConstructorWorld :== 181 -PD_Dyn_TypeCodeConstructor_Arrow :== 182 -PD_Dyn_TypeCodeConstructor_List :== 183 -PD_Dyn_TypeCodeConstructor_StrictList :== 184 -PD_Dyn_TypeCodeConstructor_UnboxedList :== 185 -PD_Dyn_TypeCodeConstructor_TailStrictList :== 186 -PD_Dyn_TypeCodeConstructor_StrictTailStrictList :== 187 -PD_Dyn_TypeCodeConstructor_UnboxedTailStrictList :== 188 -PD_Dyn_TypeCodeConstructor_Tuple :== 189 -PD_Dyn_TypeCodeConstructor_LazyArray :== 190 -PD_Dyn_TypeCodeConstructor_StrictArray :== 191 -PD_Dyn_TypeCodeConstructor_UnboxedArray :== 192 +PD_Dyn_TypeCodeConstructorInt :== 176 +PD_Dyn_TypeCodeConstructorChar :== 177 +PD_Dyn_TypeCodeConstructorReal :== 178 +PD_Dyn_TypeCodeConstructorBool :== 179 +PD_Dyn_TypeCodeConstructorDynamic :== 180 +PD_Dyn_TypeCodeConstructorFile :== 181 +PD_Dyn_TypeCodeConstructorWorld :== 182 +PD_Dyn_TypeCodeConstructor_Arrow :== 183 +PD_Dyn_TypeCodeConstructor_List :== 184 +PD_Dyn_TypeCodeConstructor_StrictList :== 185 +PD_Dyn_TypeCodeConstructor_UnboxedList :== 186 +PD_Dyn_TypeCodeConstructor_TailStrictList :== 187 +PD_Dyn_TypeCodeConstructor_StrictTailStrictList :== 188 +PD_Dyn_TypeCodeConstructor_UnboxedTailStrictList :== 189 +PD_Dyn_TypeCodeConstructor_Tuple :== 190 +PD_Dyn_TypeCodeConstructor_LazyArray :== 191 +PD_Dyn_TypeCodeConstructor_StrictArray :== 192 +PD_Dyn_TypeCodeConstructor_UnboxedArray :== 193 /* Generics */ -PD_StdGeneric :== 193 - -PD_TypeBimap :== 194 -PD_ConsBimap :== 195 -PD_map_to :== 196 -PD_map_from :== 197 - -PD_TypeUNIT :== 198 -PD_ConsUNIT :== 199 -PD_TypeEITHER :== 200 -PD_ConsLEFT :== 201 -PD_ConsRIGHT :== 202 -PD_TypePAIR :== 203 -PD_ConsPAIR :== 204 +PD_StdGeneric :== 194 + +PD_TypeBimap :== 195 +PD_ConsBimap :== 196 +PD_map_to :== 197 +PD_map_from :== 198 +PD_TypeUNIT :== 199 +PD_ConsUNIT :== 200 +PD_TypeEITHER :== 201 +PD_ConsLEFT :== 202 +PD_ConsRIGHT :== 203 +PD_TypePAIR :== 204 +PD_ConsPAIR :== 205 // for constructor info -PD_TypeCONS :== 205 -PD_ConsCONS :== 206 -PD_TypeFIELD :== 207 -PD_ConsFIELD :== 208 -PD_TypeREC :== 209 -PD_ConsREC :== 210 -PD_GenericInfo :== 211 -PD_NoGenericInfo :== 212 -PD_GenericConsInfo :== 213 -PD_GenericFieldInfo :== 214 -PD_TGenericConsDescriptor :== 215 -PD_CGenericConsDescriptor :== 216 -PD_TGenericFieldDescriptor :== 217 -PD_CGenericFieldDescriptor :== 218 -PD_TGenericTypeDefDescriptor :== 219 -PD_CGenericTypeDefDescriptor :== 220 -PD_TGenConsPrio :== 221 -PD_CGenConsNoPrio :== 222 -PD_CGenConsPrio :== 223 -PD_TGenConsAssoc :== 224 -PD_CGenConsAssocNone :== 225 -PD_CGenConsAssocLeft :== 226 -PD_CGenConsAssocRight :== 227 -PD_TGenType :== 228 -PD_CGenTypeCons :== 229 -PD_CGenTypeVar :== 230 -PD_CGenTypeArrow :== 231 -PD_CGenTypeApp :== 232 - -PD_GenericBimap :== 233 -PD_bimapId :== 234 - -PD_TypeGenericDict :== 235 - -PD_FromS :== 236 -PD_FromTS :== 237 -PD_FromSTS :== 238 -PD_FromU :== 239 -PD_FromUTS :== 240 -PD_FromO :== 241 - -PD_FromThenS :== 242 -PD_FromThenTS :== 243 -PD_FromThenSTS :== 244 -PD_FromThenU :== 245 -PD_FromThenUTS :== 246 -PD_FromThenO :== 247 - -PD_FromToS :== 248 -PD_FromToTS :== 249 -PD_FromToSTS :== 250 -PD_FromToU :== 251 -PD_FromToUTS :== 252 -PD_FromToO :== 253 - -PD_FromThenToS :== 254 -PD_FromThenToTS :== 255 -PD_FromThenToSTS :== 256 -PD_FromThenToU :== 257 -PD_FromThenToUTS :== 258 -PD_FromThenToO :== 259 - -PD_NrOfPredefSymbols :== 260 +PD_TypeCONS :== 206 +PD_ConsCONS :== 207 +PD_TypeFIELD :== 208 +PD_ConsFIELD :== 209 +PD_TypeREC :== 210 +PD_ConsREC :== 211 +PD_GenericInfo :== 212 +PD_NoGenericInfo :== 213 +PD_GenericConsInfo :== 214 +PD_GenericFieldInfo :== 215 +PD_TGenericConsDescriptor :== 216 +PD_CGenericConsDescriptor :== 217 +PD_TGenericFieldDescriptor :== 218 +PD_CGenericFieldDescriptor :== 219 +PD_TGenericTypeDefDescriptor :== 220 +PD_CGenericTypeDefDescriptor :== 221 +PD_TGenConsPrio :== 222 +PD_CGenConsNoPrio :== 223 +PD_CGenConsPrio :== 224 +PD_TGenConsAssoc :== 225 +PD_CGenConsAssocNone :== 226 +PD_CGenConsAssocLeft :== 227 +PD_CGenConsAssocRight :== 228 +PD_TGenType :== 229 +PD_CGenTypeCons :== 230 +PD_CGenTypeVar :== 231 +PD_CGenTypeArrow :== 232 +PD_CGenTypeApp :== 233 + +PD_GenericBimap :== 234 +PD_bimapId :== 235 + +PD_TypeGenericDict :== 236 + +PD_FromS :== 237 +PD_FromTS :== 238 +PD_FromSTS :== 239 +PD_FromU :== 240 +PD_FromUTS :== 241 +PD_FromO :== 242 + +PD_FromThenS :== 243 +PD_FromThenTS :== 244 +PD_FromThenSTS :== 245 +PD_FromThenU :== 246 +PD_FromThenUTS :== 247 +PD_FromThenO :== 248 + +PD_FromToS :== 249 +PD_FromToTS :== 250 +PD_FromToSTS :== 251 +PD_FromToU :== 252 +PD_FromToUTS :== 253 +PD_FromToO :== 254 + +PD_FromThenToS :== 255 +PD_FromThenToTS :== 256 +PD_FromThenToSTS :== 257 +PD_FromThenToU :== 258 +PD_FromThenToUTS :== 259 +PD_FromThenToO :== 260 + +PD_NrOfPredefSymbols :== 261 GetTupleConsIndex tup_arity :== PD_Arity2TupleSymbol + tup_arity - 2 GetTupleTypeIndex tup_arity :== PD_Arity2TupleType + tup_arity - 2 diff --git a/frontend/predef.icl b/frontend/predef.icl index 49854b8..7dc659a 100644 --- a/frontend/predef.icl +++ b/frontend/predef.icl @@ -100,12 +100,13 @@ predefined_idents [PD_StdDynamic] = i UnderscoreSystemDynamicModule_String, [PD_Dyn_DynamicTemp] = i DynamicRepresentation_String, - [PD_Dyn_Type] = i "TypeCode", + [PD_Dyn_TypeCode] = i "TypeCode", [PD_Dyn_TypeScheme] = i "TypeScheme", [PD_Dyn_TypeApp] = i "TypeApp", [PD_Dyn_TypeVar] = i "TypeVar", [PD_Dyn_TypeCons] = i "TypeCons", -// [PD_Dyn_TypePatternVar] = i "_TypePatternVar", + [PD_Dyn_TypeUnique] = i "TypeUnique", + [PD_Dyn__TypeFixedVar] = i "_TypeFixedVar", [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", @@ -330,12 +331,13 @@ where <<- (local_predefined_idents, IC_Module, PD_StdDynamic) <<- (local_predefined_idents, IC_Type, PD_Dyn_DynamicTemp) - <<- (local_predefined_idents, IC_Type, PD_Dyn_Type) + <<- (local_predefined_idents, IC_Type, PD_Dyn_TypeCode) <<- (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_TypeCons) + <<- (local_predefined_idents, IC_Expression, PD_Dyn_TypeUnique) + <<- (local_predefined_idents, IC_Expression, PD_Dyn__TypeFixedVar) <<- (local_predefined_idents, IC_Type, PD_Dyn_UnificationEnvironment) <<- (local_predefined_idents, IC_Expression, PD_Dyn_unify) <<- (local_predefined_idents, IC_Expression, PD_Dyn_initial_unification_environment) |