Commit 1d29accb authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl

Merge remote-tracking branch 'origin/master' into itask

parents 0950b075 e4ab7387
......@@ -3748,14 +3748,10 @@ where
<=< adjust_predef_symbols PD_TC_Int PD_TC__Unit mod_index STE_Constructor
)
# (pre_mod, cs_predef_symbols) = cs_predef_symbols![PD_StdGeneric]
# type_bimap = predefined_idents.[PD_TypeBimap]
| pre_mod.pds_def == mod_index
= (class_members, class_instances, fun_types, { cs & cs_predef_symbols = cs_predef_symbols}
<=< adjust_predef_symbols PD_TypeBimap PD_TypeGenericDict0 mod_index STE_Type
<=< adjustPredefSymbol PD_map_to mod_index (STE_Field type_bimap)
<=< adjustPredefSymbol PD_map_from mod_index (STE_Field type_bimap)
<=< adjust_predef_symbols PD_ConsBimap PD_CGenTypeApp mod_index STE_Constructor
<=< adjustPredefSymbol PD_bimapId mod_index STE_DclFunction
<=< adjust_predef_symbols PD_TypeUNIT PD_TypeGenericDict0 mod_index STE_Type
<=< adjust_predef_symbols PD_ConsUNIT PD_CGenTypeApp mod_index STE_Constructor
<=< adjustPredefSymbol PD_GenericBimap mod_index (STE_Generic -1)
<=< adjustPredefSymbolNoNotDefinedError PD_GenericBinumap mod_index (STE_Generic -1)
)
......
......@@ -168,144 +168,138 @@ PD_Dyn_normalise :== 177
/* Generics */
PD_StdGeneric :== 178
// Generics types
PD_TypeBimap :== 179
PD_TypeUNIT :== 180
PD_TypeEITHER :== 181
PD_TypePAIR :== 182
PD_TypeUNIT :== 179
PD_TypeEITHER :== 180
PD_TypePAIR :== 181
// for constructor info
PD_TypeCONS :== 183
PD_TypeRECORD :== 184
PD_TypeFIELD :== 185
PD_TypeOBJECT :== 186
PD_TGenericConsDescriptor :== 187
PD_TGenericRecordDescriptor :== 188
PD_TGenericFieldDescriptor :== 189
PD_TGenericTypeDefDescriptor :== 190
PD_TGenConsPrio :== 191
PD_TGenConsAssoc :== 192
PD_TGenType :== 193
PD_TypeGenericDict :== 194
PD_TypeGenericDict0 :== 195
// Generics fields
PD_map_to :== 196
PD_map_from :== 197
PD_TypeCONS :== 182
PD_TypeRECORD :== 183
PD_TypeFIELD :== 184
PD_TypeOBJECT :== 185
PD_TGenericConsDescriptor :== 186
PD_TGenericRecordDescriptor :== 187
PD_TGenericFieldDescriptor :== 188
PD_TGenericTypeDefDescriptor :== 189
PD_TGenConsPrio :== 190
PD_TGenConsAssoc :== 191
PD_TGenType :== 192
PD_TypeGenericDict :== 193
PD_TypeGenericDict0 :== 194
// Generics expression
PD_ConsBimap :== 198
PD_ConsUNIT :== 199
PD_ConsLEFT :== 200
PD_ConsRIGHT :== 201
PD_ConsPAIR :== 202
PD_ConsUNIT :== 195
PD_ConsLEFT :== 196
PD_ConsRIGHT :== 197
PD_ConsPAIR :== 198
// for constructor info
PD_ConsCONS :== 203
PD_ConsRECORD :== 204
PD_ConsFIELD :== 205
PD_ConsOBJECT :== 206
PD_CGenericConsDescriptor :== 207
PD_CGenericRecordDescriptor :== 208
PD_CGenericFieldDescriptor :== 209
PD_CGenericTypeDefDescriptor :== 210
PD_CGenConsNoPrio :== 211
PD_CGenConsPrio :== 212
PD_CGenConsAssocNone :== 213
PD_CGenConsAssocLeft :== 214
PD_CGenConsAssocRight :== 215
PD_CGenTypeCons :== 216
PD_CGenTypeVar :== 217
PD_CGenTypeArrow :== 218
PD_CGenTypeApp :== 219
PD_bimapId :== 220
PD_GenericBimap :== 221
PD_GenericBinumap :== 222
PD_FromS :== 223
PD_FromTS :== 224
PD_FromSTS :== 225
PD_FromU :== 226
PD_FromUTS :== 227
PD_FromO :== 228
PD_FromThenS :== 229
PD_FromThenTS :== 230
PD_FromThenSTS :== 231
PD_FromThenU :== 232
PD_FromThenUTS :== 233
PD_FromThenO :== 234
PD_FromToS :== 235
PD_FromToTS :== 236
PD_FromToSTS :== 237
PD_FromToU :== 238
PD_FromToUTS :== 239
PD_FromToO :== 240
PD_FromThenToS :== 241
PD_FromThenToTS :== 242
PD_FromThenToSTS :== 243
PD_FromThenToU :== 244
PD_FromThenToUTS :== 245
PD_FromThenToO :== 246
PD_Dyn__to_TypeCodeConstructor :== 247
PD_TypeCodeConstructor :== 248
PD_TC_Int :== 249
PD_TC_Char :== 250
PD_TC_Real :== 251
PD_TC_Bool :== 252
PD_TC_Dynamic :== 253
PD_TC_File :== 254
PD_TC_World :== 255
PD_TC__Arrow :== 256
PD_TC__List :== 257
PD_TC__StrictList :== 258
PD_TC__UnboxedList :== 259
PD_TC__TailStrictList :== 260
PD_TC__StrictTailStrictList :== 261
PD_TC__UnboxedTailStrictList :== 262
PD_TC__Tuple2 :== 263
PD_TC__Tuple3 :== 264
PD_TC__Tuple4 :== 265
PD_TC__Tuple5 :== 266
PD_TC__Tuple6 :== 267
PD_TC__Tuple7 :== 268
PD_TC__Tuple8 :== 269
PD_TC__Tuple9 :== 270
PD_TC__Tuple10 :== 271
PD_TC__Tuple11 :== 272
PD_TC__Tuple12 :== 273
PD_TC__Tuple13 :== 274
PD_TC__Tuple14 :== 275
PD_TC__Tuple15 :== 276
PD_TC__Tuple16 :== 277
PD_TC__Tuple17 :== 278
PD_TC__Tuple18 :== 279
PD_TC__Tuple19 :== 280
PD_TC__Tuple20 :== 281
PD_TC__Tuple21 :== 282
PD_TC__Tuple22 :== 283
PD_TC__Tuple23 :== 284
PD_TC__Tuple24 :== 285
PD_TC__Tuple25 :== 286
PD_TC__Tuple26 :== 287
PD_TC__Tuple27 :== 288
PD_TC__Tuple28 :== 289
PD_TC__Tuple29 :== 290
PD_TC__Tuple30 :== 291
PD_TC__Tuple31 :== 292
PD_TC__Tuple32 :== 293
PD_TC__LazyArray :== 294
PD_TC__StrictArray :== 295
PD_TC__UnboxedArray :== 296
PD_TC__Unit :== 297
PD_NrOfPredefSymbols :== 298
PD_ConsCONS :== 199
PD_ConsRECORD :== 200
PD_ConsFIELD :== 201
PD_ConsOBJECT :== 202
PD_CGenericConsDescriptor :== 203
PD_CGenericRecordDescriptor :== 204
PD_CGenericFieldDescriptor :== 205
PD_CGenericTypeDefDescriptor :== 206
PD_CGenConsNoPrio :== 207
PD_CGenConsPrio :== 208
PD_CGenConsAssocNone :== 209
PD_CGenConsAssocLeft :== 210
PD_CGenConsAssocRight :== 211
PD_CGenTypeCons :== 212
PD_CGenTypeVar :== 213
PD_CGenTypeArrow :== 214
PD_CGenTypeApp :== 215
PD_GenericBimap :== 216
PD_GenericBinumap :== 217
PD_FromS :== 218
PD_FromTS :== 219
PD_FromSTS :== 220
PD_FromU :== 221
PD_FromUTS :== 222
PD_FromO :== 223
PD_FromThenS :== 224
PD_FromThenTS :== 225
PD_FromThenSTS :== 226
PD_FromThenU :== 227
PD_FromThenUTS :== 228
PD_FromThenO :== 229
PD_FromToS :== 230
PD_FromToTS :== 231
PD_FromToSTS :== 232
PD_FromToU :== 233
PD_FromToUTS :== 234
PD_FromToO :== 235
PD_FromThenToS :== 236
PD_FromThenToTS :== 237
PD_FromThenToSTS :== 238
PD_FromThenToU :== 239
PD_FromThenToUTS :== 240
PD_FromThenToO :== 241
PD_Dyn__to_TypeCodeConstructor :== 242
PD_TypeCodeConstructor :== 243
PD_TC_Int :== 244
PD_TC_Char :== 245
PD_TC_Real :== 246
PD_TC_Bool :== 247
PD_TC_Dynamic :== 248
PD_TC_File :== 249
PD_TC_World :== 250
PD_TC__Arrow :== 251
PD_TC__List :== 252
PD_TC__StrictList :== 253
PD_TC__UnboxedList :== 254
PD_TC__TailStrictList :== 255
PD_TC__StrictTailStrictList :== 256
PD_TC__UnboxedTailStrictList :== 257
PD_TC__Tuple2 :== 258
PD_TC__Tuple3 :== 259
PD_TC__Tuple4 :== 260
PD_TC__Tuple5 :== 261
PD_TC__Tuple6 :== 262
PD_TC__Tuple7 :== 263
PD_TC__Tuple8 :== 264
PD_TC__Tuple9 :== 265
PD_TC__Tuple10 :== 266
PD_TC__Tuple11 :== 267
PD_TC__Tuple12 :== 268
PD_TC__Tuple13 :== 269
PD_TC__Tuple14 :== 270
PD_TC__Tuple15 :== 271
PD_TC__Tuple16 :== 272
PD_TC__Tuple17 :== 273
PD_TC__Tuple18 :== 274
PD_TC__Tuple19 :== 275
PD_TC__Tuple20 :== 276
PD_TC__Tuple21 :== 277
PD_TC__Tuple22 :== 278
PD_TC__Tuple23 :== 279
PD_TC__Tuple24 :== 280
PD_TC__Tuple25 :== 281
PD_TC__Tuple26 :== 282
PD_TC__Tuple27 :== 283
PD_TC__Tuple28 :== 284
PD_TC__Tuple29 :== 285
PD_TC__Tuple30 :== 286
PD_TC__Tuple31 :== 287
PD_TC__Tuple32 :== 288
PD_TC__LazyArray :== 289
PD_TC__StrictArray :== 290
PD_TC__UnboxedArray :== 291
PD_TC__Unit :== 292
PD_NrOfPredefSymbols :== 293
GetTupleConsIndex tup_arity :== PD_Arity2TupleSymbol + tup_arity - 2
GetTupleTypeIndex tup_arity :== PD_Arity2TupleType + tup_arity - 2
......
......@@ -173,10 +173,6 @@ predefined_idents
[PD_TC__Unit] = i "TC__Unit",
[PD_StdGeneric] = i "StdGeneric",
[PD_TypeBimap] = i "Bimap",
[PD_ConsBimap] = i "_Bimap",
[PD_map_to] = i "map_to",
[PD_map_from] = i "map_from",
[PD_TypeUNIT] = i "UNIT",
[PD_ConsUNIT] = i "UNIT",
[PD_TypeEITHER] = i "EITHER",
......@@ -213,7 +209,6 @@ predefined_idents
[PD_CGenTypeArrow] = i "GenTypeArrow",
[PD_CGenTypeApp] = i "GenTypeApp",
[PD_bimapId] = i "bimapId",
[PD_GenericBimap] = i "bimap",
[PD_GenericBinumap] = i "binumap",
......@@ -378,15 +373,11 @@ where
<<- (local_predefined_idents, IC_Module NoQualifiedIdents, PD_StdGeneric)
# hash_table = put_predefined_idents_in_hash_table PD_TC_Int PD_TC__Unit IC_Expression local_predefined_idents hash_table
# hash_table = put_predefined_idents_in_hash_table PD_TypeBimap PD_TypeGenericDict0 IC_Type local_predefined_idents hash_table
# hash_table = put_predefined_idents_in_hash_table PD_ConsBimap PD_bimapId IC_Expression local_predefined_idents hash_table
# hash_table = put_predefined_idents_in_hash_table PD_TypeUNIT PD_TypeGenericDict0 IC_Type local_predefined_idents hash_table
# hash_table = put_predefined_idents_in_hash_table PD_ConsUNIT PD_CGenTypeApp IC_Expression local_predefined_idents hash_table
<<- (local_predefined_idents, IC_Generic, PD_GenericBimap)
<<- (local_predefined_idents, IC_Generic, PD_GenericBinumap)
# bimap_type = local_predefined_idents.[PD_TypeBimap]
# hash_table = hash_table
<<- (local_predefined_idents, IC_Field bimap_type, PD_map_to)
<<- (local_predefined_idents, IC_Field bimap_type, PD_map_from)
# hash_table = hash_table
<<- (local_predefined_idents, IC_Module NoQualifiedIdents, PD_StdMisc)
<<- (local_predefined_idents, IC_Expression, PD_abort)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment