Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
clean-compiler-and-rts
compiler
Commits
e4ab7387
Commit
e4ab7387
authored
Oct 11, 2019
by
johnvg@science.ru.nl
Browse files
remove predefined type Bimap and function bimapId imported from module StdGeneric
parent
28dd227f
Changes
3
Hide whitespace changes
Inline
Side-by-side
frontend/check.icl
View file @
e4ab7387
...
...
@@ -3557,15 +3557,11 @@ 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_TypeGenericDict
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
<=<
adjust_predef_symbols
PD_TypeUNIT
PD_TypeGenericDict
mod_index
STE_Type
<=<
adjust_predef_symbols
PD_ConsUNIT
PD_CGenTypeApp
mod_index
STE_Constructor
<=<
adjustPredefSymbol
PD_GenericBimap
mod_index
STE_Generic
<=<
adjustPredefSymbol
PD_bimapId
mod_index
STE_DclFunction
)
#
(
pre_mod
,
cs_predef_symbols
)
=
cs_predef_symbols
![
PD_StdMisc
]
|
pre_mod
.
pds_def
==
mod_index
...
...
frontend/predef.dcl
View file @
e4ab7387
...
...
@@ -168,142 +168,136 @@ 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
// Generics fields
PD_map_to
:==
195
PD_map_from
:==
196
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
// Generics expression
PD_ConsBimap
:==
197
PD_ConsUNIT
:==
198
PD_ConsLEFT
:==
199
PD_ConsRIGHT
:==
200
PD_ConsPAIR
:==
201
PD_ConsUNIT
:==
194
PD_ConsLEFT
:==
195
PD_ConsRIGHT
:==
196
PD_ConsPAIR
:==
197
// for constructor info
PD_ConsCONS
:==
202
PD_ConsRECORD
:==
203
PD_ConsFIELD
:==
204
PD_ConsOBJECT
:==
205
PD_CGenericConsDescriptor
:==
206
PD_CGenericRecordDescriptor
:==
207
PD_CGenericFieldDescriptor
:==
208
PD_CGenericTypeDefDescriptor
:==
209
PD_CGenConsNoPrio
:==
210
PD_CGenConsPrio
:==
211
PD_CGenConsAssocNone
:==
212
PD_CGenConsAssocLeft
:==
213
PD_CGenConsAssocRight
:==
214
PD_CGenTypeCons
:==
215
PD_CGenTypeVar
:==
216
PD_CGenTypeArrow
:==
217
PD_CGenTypeApp
:==
218
PD_bimapId
:==
219
PD_GenericBimap
:==
220
PD_FromS
:==
221
PD_FromTS
:==
222
PD_FromSTS
:==
223
PD_FromU
:==
224
PD_FromUTS
:==
225
PD_FromO
:==
226
PD_FromThenS
:==
227
PD_FromThenTS
:==
228
PD_FromThenSTS
:==
229
PD_FromThenU
:==
230
PD_FromThenUTS
:==
231
PD_FromThenO
:==
232
PD_FromToS
:==
233
PD_FromToTS
:==
234
PD_FromToSTS
:==
235
PD_FromToU
:==
236
PD_FromToUTS
:==
237
PD_FromToO
:==
238
PD_FromThenToS
:==
239
PD_FromThenToTS
:==
240
PD_FromThenToSTS
:==
241
PD_FromThenToU
:==
242
PD_FromThenToUTS
:==
243
PD_FromThenToO
:==
244
PD_Dyn__to_TypeCodeConstructor
:==
245
PD_TypeCodeConstructor
:==
246
PD_TC_Int
:==
247
PD_TC_Char
:==
248
PD_TC_Real
:==
249
PD_TC_Bool
:==
250
PD_TC_Dynamic
:==
251
PD_TC_File
:==
252
PD_TC_World
:==
253
PD_TC__Arrow
:==
254
PD_TC__List
:==
255
PD_TC__StrictList
:==
256
PD_TC__UnboxedList
:==
257
PD_TC__TailStrictList
:==
258
PD_TC__StrictTailStrictList
:==
259
PD_TC__UnboxedTailStrictList
:==
260
PD_TC__Tuple2
:==
261
PD_TC__Tuple3
:==
262
PD_TC__Tuple4
:==
263
PD_TC__Tuple5
:==
264
PD_TC__Tuple6
:==
265
PD_TC__Tuple7
:==
266
PD_TC__Tuple8
:==
267
PD_TC__Tuple9
:==
268
PD_TC__Tuple10
:==
269
PD_TC__Tuple11
:==
270
PD_TC__Tuple12
:==
271
PD_TC__Tuple13
:==
272
PD_TC__Tuple14
:==
273
PD_TC__Tuple15
:==
274
PD_TC__Tuple16
:==
275
PD_TC__Tuple17
:==
276
PD_TC__Tuple18
:==
277
PD_TC__Tuple19
:==
278
PD_TC__Tuple20
:==
279
PD_TC__Tuple21
:==
280
PD_TC__Tuple22
:==
281
PD_TC__Tuple23
:==
282
PD_TC__Tuple24
:==
283
PD_TC__Tuple25
:==
284
PD_TC__Tuple26
:==
285
PD_TC__Tuple27
:==
286
PD_TC__Tuple28
:==
287
PD_TC__Tuple29
:==
288
PD_TC__Tuple30
:==
289
PD_TC__Tuple31
:==
290
PD_TC__Tuple32
:==
291
PD_TC__LazyArray
:==
292
PD_TC__StrictArray
:==
293
PD_TC__UnboxedArray
:==
294
PD_TC__Unit
:==
295
PD_NrOfPredefSymbols
:==
296
PD_ConsCONS
:==
198
PD_ConsRECORD
:==
199
PD_ConsFIELD
:==
200
PD_ConsOBJECT
:==
201
PD_CGenericConsDescriptor
:==
202
PD_CGenericRecordDescriptor
:==
203
PD_CGenericFieldDescriptor
:==
204
PD_CGenericTypeDefDescriptor
:==
205
PD_CGenConsNoPrio
:==
206
PD_CGenConsPrio
:==
207
PD_CGenConsAssocNone
:==
208
PD_CGenConsAssocLeft
:==
209
PD_CGenConsAssocRight
:==
210
PD_CGenTypeCons
:==
211
PD_CGenTypeVar
:==
212
PD_CGenTypeArrow
:==
213
PD_CGenTypeApp
:==
214
PD_GenericBimap
:==
215
PD_FromS
:==
216
PD_FromTS
:==
217
PD_FromSTS
:==
218
PD_FromU
:==
219
PD_FromUTS
:==
220
PD_FromO
:==
221
PD_FromThenS
:==
222
PD_FromThenTS
:==
223
PD_FromThenSTS
:==
224
PD_FromThenU
:==
225
PD_FromThenUTS
:==
226
PD_FromThenO
:==
227
PD_FromToS
:==
228
PD_FromToTS
:==
229
PD_FromToSTS
:==
230
PD_FromToU
:==
231
PD_FromToUTS
:==
232
PD_FromToO
:==
233
PD_FromThenToS
:==
234
PD_FromThenToTS
:==
235
PD_FromThenToSTS
:==
236
PD_FromThenToU
:==
237
PD_FromThenToUTS
:==
238
PD_FromThenToO
:==
239
PD_Dyn__to_TypeCodeConstructor
:==
240
PD_TypeCodeConstructor
:==
241
PD_TC_Int
:==
242
PD_TC_Char
:==
243
PD_TC_Real
:==
244
PD_TC_Bool
:==
245
PD_TC_Dynamic
:==
246
PD_TC_File
:==
247
PD_TC_World
:==
248
PD_TC__Arrow
:==
249
PD_TC__List
:==
250
PD_TC__StrictList
:==
251
PD_TC__UnboxedList
:==
252
PD_TC__TailStrictList
:==
253
PD_TC__StrictTailStrictList
:==
254
PD_TC__UnboxedTailStrictList
:==
255
PD_TC__Tuple2
:==
256
PD_TC__Tuple3
:==
257
PD_TC__Tuple4
:==
258
PD_TC__Tuple5
:==
259
PD_TC__Tuple6
:==
260
PD_TC__Tuple7
:==
261
PD_TC__Tuple8
:==
262
PD_TC__Tuple9
:==
263
PD_TC__Tuple10
:==
264
PD_TC__Tuple11
:==
265
PD_TC__Tuple12
:==
266
PD_TC__Tuple13
:==
267
PD_TC__Tuple14
:==
268
PD_TC__Tuple15
:==
269
PD_TC__Tuple16
:==
270
PD_TC__Tuple17
:==
271
PD_TC__Tuple18
:==
272
PD_TC__Tuple19
:==
273
PD_TC__Tuple20
:==
274
PD_TC__Tuple21
:==
275
PD_TC__Tuple22
:==
276
PD_TC__Tuple23
:==
277
PD_TC__Tuple24
:==
278
PD_TC__Tuple25
:==
279
PD_TC__Tuple26
:==
280
PD_TC__Tuple27
:==
281
PD_TC__Tuple28
:==
282
PD_TC__Tuple29
:==
283
PD_TC__Tuple30
:==
284
PD_TC__Tuple31
:==
285
PD_TC__Tuple32
:==
286
PD_TC__LazyArray
:==
287
PD_TC__StrictArray
:==
288
PD_TC__UnboxedArray
:==
289
PD_TC__Unit
:==
290
PD_NrOfPredefSymbols
:==
291
GetTupleConsIndex
tup_arity
:==
PD_Arity2TupleSymbol
+
tup_arity
-
2
GetTupleTypeIndex
tup_arity
:==
PD_Arity2TupleType
+
tup_arity
-
2
...
...
frontend/predef.icl
View file @
e4ab7387
...
...
@@ -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"
,
...
...
@@ -214,7 +210,6 @@ predefined_idents
[
PD_CGenTypeApp
]
=
i
"GenTypeApp"
,
[
PD_GenericBimap
]
=
i
"bimap"
,
[
PD_bimapId
]
=
i
"bimapId"
,
[
PD_TypeGenericDict
]
=
i
"GenericDict"
,
...
...
@@ -376,14 +371,10 @@ 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_Type
Bimap
PD_TypeGenericDict
IC_Type
local_predefined_idents
hash_table
#
hash_table
=
put_predefined_idents_in_hash_table
PD_Cons
Bimap
PD_bimapId
IC_Expression
local_predefined_idents
hash_table
#
hash_table
=
put_predefined_idents_in_hash_table
PD_Type
UNIT
PD_TypeGenericDict
IC_Type
local_predefined_idents
hash_table
#
hash_table
=
put_predefined_idents_in_hash_table
PD_Cons
UNIT
PD_CGenTypeApp
IC_Expression
local_predefined_idents
hash_table
<<-
(
local_predefined_idents
,
IC_Generic
,
PD_GenericBimap
)
#
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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment