diff options
Diffstat (limited to 'frontend/syntax.dcl')
| -rw-r--r-- | frontend/syntax.dcl | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index 3ac7259..d87478e 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -63,10 +63,7 @@ instance toString Ident { mod_name :: !Ident , mod_type :: !ModuleKind , mod_imports :: ![ParsedImport] -// RWS ... , mod_imported_objects :: ![ImportedObject] -// ... RWS -// , mod_exports :: ![Export] , mod_defs :: !defs } @@ -134,9 +131,7 @@ cIsNotAFunction :== False | PD_Instance (ParsedInstance ParsedDefinition) | PD_Instances [ParsedInstance ParsedDefinition] | PD_Import [ParsedImport] -// RWS ... | PD_ImportedObjects [ImportedObject] -// ... RWS | PD_Erroneous :: FunKind = FK_Function | FK_Macro | FK_Caf | FK_Unknown @@ -298,14 +293,12 @@ instance toString (Import from_symbol), AttributeVar, TypeAttribute, Annotation :: OptimizeInfo :== (Optional !Index) */ -// RWS ... cIsImportedLibrary :== True cIsImportedObject :== False :: ImportedObject = { io_is_library :: !Bool , io_name :: !{#Char} } -// ... RWS :: RecordType = { rt_constructor :: !DefinedSymbol @@ -918,7 +911,8 @@ cNonUniqueSelection :== False | PE_Lambda !Ident ![ParsedExpr] !ParsedExpr | PE_Tuple ![ParsedExpr] | PE_Record !ParsedExpr !(Optional Ident) ![FieldAssignment] - | PE_Array !ParsedExpr ![ElemAssignment] ![Qualifier] + | PE_Array !ParsedExpr ![ElemAssignment] // RWS +++ remove PE_Array (not really used anymore) ![Qualifier] + | PE_UpdateComprehension !ParsedExpr !ParsedExpr !ParsedExpr ![Qualifier] | PE_ArrayDenot ![ParsedExpr] | PE_Selection !Bool !ParsedExpr ![ParsedSelection] | PE_Update !ParsedExpr [ParsedSelection] ParsedExpr @@ -946,17 +940,19 @@ cNonUniqueSelection :== False cIsListGenerator :== True cIsArrayGenerator :== False +:: LineAndColumn = {lc_line :: !Int, lc_column :: !Int} + :: Generator = { gen_kind :: !GeneratorKind , gen_pattern :: !ParsedExpr , gen_expr :: !ParsedExpr - , gen_var :: !Ident + , gen_position :: !LineAndColumn } :: Qualifier = { qual_generators :: ![Generator] , qual_filter :: !Optional ParsedExpr - , qual_fun_id :: !Ident + , qual_position :: !LineAndColumn } :: Sequence = SQ_FromThen ParsedExpr ParsedExpr |