diff options
| -rw-r--r-- | frontend/generics1.icl | 3 | ||||
| -rw-r--r-- | frontend/parse.icl | 12 | ||||
| -rw-r--r-- | frontend/predef.icl | 4 | ||||
| -rw-r--r-- | frontend/syntax.dcl | 1 |
4 files changed, 9 insertions, 11 deletions
diff --git a/frontend/generics1.icl b/frontend/generics1.icl index 1b72f5e..db754bf 100644 --- a/frontend/generics1.icl +++ b/frontend/generics1.icl @@ -1455,8 +1455,7 @@ where class_pos = gen_pos, class_members = createArray 1 class_member, class_cons_vars = 0, // dotted class variables - class_dictionary = class_dictionary, - class_arg_kinds = [kind] + class_dictionary = class_dictionary } = class_def diff --git a/frontend/parse.icl b/frontend/parse.icl index 57cb157..88d71ab 100644 --- a/frontend/parse.icl +++ b/frontend/parse.icl @@ -1223,8 +1223,8 @@ wantClassDefinition parseContext pos pState (members, pState) = wantDefinitions (SetClassOrInstanceDefsContext parseContext) pState class_def = { class_ident = class_id, class_arity = class_arity, class_args = class_args, class_context = contexts, class_pos = pos, class_members = {}, class_cons_vars = class_cons_vars, - class_dictionary = { ds_ident = { class_id & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex}, - class_arg_kinds = [] } + class_dictionary = { ds_ident = { class_id & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex} + } pState = wantEndGroup "class" pState = (PD_Class class_def members, pState) | isEmpty contexts @@ -1234,8 +1234,8 @@ wantClassDefinition parseContext pos pState (class_id, pState) = stringToIdent class_or_member_name IC_Class pState class_def = { class_ident = class_id, class_arity = class_arity, class_args = class_args, class_context = contexts, class_pos = pos, class_members = {}, class_cons_vars = class_cons_vars, - class_dictionary = { ds_ident = { class_id & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex }, - class_arg_kinds = []} + class_dictionary = { ds_ident = { class_id & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex } + } pState = wantEndOfDefinition "class definition" pState = (PD_Class class_def [], pState) = (PD_Erroneous, parseError "Class Definition" (Yes token) "<class definition>" pState) @@ -1283,8 +1283,8 @@ wantClassDefinition parseContext pos pState member = PD_TypeSpec pos member_id prio (Yes tspec) SP_None class_def = { class_ident = class_id, class_arity = class_arity, class_args = class_args, class_context = contexts, class_pos = pos, class_members = {}, class_cons_vars = class_cons_vars, - class_dictionary = { ds_ident = { class_id & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex }, - class_arg_kinds = []} + class_dictionary = { ds_ident = { class_id & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex } + } pState = wantEndOfDefinition "overloaded function" pState = (PD_Class class_def [member], pState) diff --git a/frontend/predef.icl b/frontend/predef.icl index 1354f25..3f1c69d 100644 --- a/frontend/predef.icl +++ b/frontend/predef.icl @@ -562,8 +562,8 @@ where class_def = { class_ident = tc_class_name, class_arity = 1, class_args = [class_var], class_context = [], class_members = {{ds_ident = tc_member_name, ds_index = cTCMemberSymbIndex, ds_arity = 0 }}, class_cons_vars = 0, - class_dictionary = { ds_ident = { tc_class_name & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex }, class_pos = NoPos, - class_arg_kinds = [] } + class_dictionary = { ds_ident = { tc_class_name & id_info = nilPtr }, ds_arity = 0, ds_index = NoIndex }, class_pos = NoPos + } = (class_def, member_def, pre_def_symbols) diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index c9b468b..d82da23 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -268,7 +268,6 @@ cNameLocationDependent :== True , class_dictionary :: !DefinedSymbol , class_pos :: !Position , class_cons_vars :: !BITVECT - , class_arg_kinds :: ![TypeKind] // filled in in checkKindCorrectness phase } :: ClassDefInfos :== {# .{! [TypeKind]}} |