diff options
| -rw-r--r-- | frontend/parse.icl | 6 | ||||
| -rw-r--r-- | frontend/postparse.icl | 138 | ||||
| -rw-r--r-- | frontend/scanner.dcl | 1 | ||||
| -rw-r--r-- | frontend/scanner.icl | 17 | ||||
| -rw-r--r-- | frontend/syntax.dcl | 5 | ||||
| -rw-r--r-- | frontend/syntax.icl | 12 |
6 files changed, 95 insertions, 84 deletions
diff --git a/frontend/parse.icl b/frontend/parse.icl index 2955d9c..0a419f2 100644 --- a/frontend/parse.icl +++ b/frontend/parse.icl @@ -2675,16 +2675,14 @@ where (lhs_expr, pState) = wantExpression cIsAPattern pState (token, pState) = nextToken FunctionContext pState | token == LeftArrowToken -//MW3 was: = want_generators IsListGenerator (toLineAndColumn qual_position) lhs_expr pState = want_generators IsListGenerator (toLineAndColumn qual_position) qual_filename lhs_expr pState + | token == LeftArrowWithBarToken + = want_generators IsOverloadedListGenerator (toLineAndColumn qual_position) qual_filename lhs_expr pState | token == LeftArrowColonToken -//MW3 was: = want_generators IsArrayGenerator (toLineAndColumn qual_position) lhs_expr pState = want_generators IsArrayGenerator (toLineAndColumn qual_position) qual_filename lhs_expr pState = ({qual_generators = [], qual_filter = No, qual_position = {lc_line = 0, lc_column = 0}, qual_filename = "" }, parseError "comprehension: qualifier" (Yes token) "qualifier(s)" pState) -//MW3 was: want_generators :: !GeneratorKind !LineAndColumn !ParsedExpr !ParseState -> (!Qualifier, !ParseState) -//MW3 was: want_generators gen_kind qual_position pattern_exp pState want_generators :: !GeneratorKind !LineAndColumn !FileName !ParsedExpr !ParseState -> (!Qualifier, !ParseState) want_generators gen_kind qual_position qual_filename pattern_exp pState # (gen_position, pState) = getPosition pState diff --git a/frontend/postparse.icl b/frontend/postparse.icl index a8c53a0..112b02b 100644 --- a/frontend/postparse.icl +++ b/frontend/postparse.icl @@ -376,9 +376,9 @@ transformLambda lam_ident args result pos icl_module lam_body = [{pb_args = args, pb_rhs = lam_rhs, pb_position = pos }] = MakeNewImpOrDefFunction icl_module lam_ident (length args) lam_body (FK_Function cNameLocationDependent) NoPrio No pos -makeLazyConsExpression :: ParsedExpr ParsedExpr *CollectAdmin -> (ParsedExpr,*CollectAdmin) -makeLazyConsExpression a1 a2 ca=:{ca_predefs} - #! cons_id = ca_predefs.[PD_ConsSymbol] +makeConsExpressionForGenerator :: GeneratorKind ParsedExpr ParsedExpr *CollectAdmin -> (ParsedExpr,*CollectAdmin) +makeConsExpressionForGenerator gen_kind a1 a2 ca=:{ca_predefs} + #! cons_id = ca_predefs.[case gen_kind of IsListGenerator -> PD_ConsSymbol ; _ -> PD_OverloadedConsSymbol] = (PE_List [PE_Ident cons_id, a1, a2], ca) makeNilExpression :: Int *CollectAdmin -> (ParsedExpr,*CollectAdmin) @@ -408,7 +408,69 @@ makeConsExpression predef_cons_index a1 a2 ca=:{ca_predefs} :: IndexGenerator :== Optional (ParsedExpr,[([ParsedDefinition],ParsedExpr,ParsedExpr)]) transformGenerator :: Generator String IndexGenerator *CollectAdmin -> (!TransformedGenerator,!IndexGenerator,!Int,!*CollectAdmin) -transformGenerator {gen_kind=IsListGenerator, gen_expr=PE_Sequ (SQ_FromTo from_exp to_exp), gen_pattern, gen_position} qual_filename index_generator ca +transformGenerator {gen_kind=IsArrayGenerator, gen_expr, gen_pattern, gen_position} qual_filename index_generator ca + # (array, ca) = prefixAndPositionToIdentExp "g_a" gen_position ca + (n, ca) = prefixAndPositionToIdentExp "g_s" gen_position ca + (n2, ca) = prefixAndPositionToIdentExp "g_s2" gen_position ca + (a2, ca) = prefixAndPositionToIdentExp "g_a2" gen_position ca + (gen_var_case1, ca) = prefixAndPositionToIdent "g_c1" gen_position ca + (gen_var_case2, ca) = prefixAndPositionToIdent "g_c2" gen_position ca + (less_or_equal, ca) = get_predef_id PD_LessOrEqualFun ca + (sub, ca) = get_predef_id PD_SubFun ca + (usize, ca) = get_predef_id PD_UnqArraySizeFun ca + (uselect, ca) = get_predef_id PD_UnqArraySelectFun ca + pattern = PE_Tuple [gen_pattern, array] + = case index_generator of + No + # (i, ca) = prefixAndPositionToIdentExp "g_i" gen_position ca + (inc, ca) = get_predef_id PD_IncFun ca + # dec_n = PE_List [n,PE_Ident sub,PE_Basic (BVI "1")] + # transformed_generator + = { tg_expr = ([PD_NodeDef (LinePos qual_filename gen_position.lc_line) (PE_Tuple [n,a2]) (exprToRhs (PE_List [PE_Ident usize, gen_expr]))], + [PE_Basic (BVI "0"),dec_n,a2]) + , tg_lhs_arg = [i, n, array] + , tg_case_end_expr = PE_List [i,PE_Ident less_or_equal, n] + , tg_case_end_pattern = PE_Basic (BVB True) + , tg_element = PE_List [PE_Ident uselect, array, i] + , tg_element_is_uselect=True + , tg_pattern = pattern + , tg_rhs_continuation = [PE_List [PE_Ident inc, i], n, array] + , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 + } + -> (transformed_generator,Yes (i,[([],dec_n,n2)]),2,ca) + Yes (i,[]) + # (inc, ca) = get_predef_id PD_IncFun ca + # dec_n = PE_List [n,PE_Ident sub,PE_Basic (BVI "1")] + # transformed_generator + = { tg_expr = ([PD_NodeDef (LinePos qual_filename gen_position.lc_line) (PE_Tuple [n,a2]) (exprToRhs (PE_List [PE_Ident usize, gen_expr]))], + [dec_n,a2]) + , tg_lhs_arg = [n,array] + , tg_case_end_expr = PE_List [i,PE_Ident less_or_equal, n] + , tg_case_end_pattern = PE_Basic (BVB True) + , tg_element = PE_List [PE_Ident uselect, array, i] + , tg_element_is_uselect=True + , tg_pattern = pattern + , tg_rhs_continuation = [n,array] + , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 + } + -> (transformed_generator,Yes (i,[([],dec_n,n2)]),1,ca) + Yes (i,size_expressions) + # transformed_generator + = { tg_expr = ([],[a2]) + , tg_lhs_arg = [array] + , tg_case_end_expr = PE_Empty + , tg_case_end_pattern = PE_Empty + , tg_element = PE_List [PE_Ident uselect, array, i] + , tg_element_is_uselect=True + , tg_pattern = pattern + , tg_rhs_continuation = [array] + , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 + } + # size_expression + =([PD_NodeDef (LinePos qual_filename gen_position.lc_line) (PE_Tuple [n,a2]) (exprToRhs (PE_List [PE_Ident usize, gen_expr]))], + (PE_List [n,PE_Ident sub,PE_Basic (BVI "1")]),n2) + -> (transformed_generator,Yes (i,[size_expression:size_expressions]),0,ca) +transformGenerator {gen_kind, gen_expr=PE_Sequ (SQ_FromTo from_exp to_exp), gen_pattern, gen_position} qual_filename index_generator ca # (n, ca) = prefixAndPositionToIdentExp "g_s" gen_position ca (gen_var_case1, ca) = prefixAndPositionToIdent "g_c1" gen_position ca (gen_var_case2, ca) = prefixAndPositionToIdent "g_c2" gen_position ca @@ -475,7 +537,7 @@ transformGenerator {gen_kind=IsListGenerator, gen_expr=PE_Sequ (SQ_FromTo from_e , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 } -> (transformed_generator,index_generator,0,ca) -transformGenerator {gen_kind=IsListGenerator, gen_expr=PE_Sequ (SQ_From from_exp), gen_pattern, gen_position} qual_filename index_generator ca +transformGenerator {gen_kind, gen_expr=PE_Sequ (SQ_From from_exp), gen_pattern, gen_position} qual_filename index_generator ca # (gen_var_case1, ca) = prefixAndPositionToIdent "g_c1" gen_position ca (gen_var_case2, ca) = prefixAndPositionToIdent "g_c2" gen_position ca = case from_exp of @@ -524,13 +586,13 @@ transformGenerator {gen_kind=IsListGenerator, gen_expr=PE_Sequ (SQ_From from_exp , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 } -> (transformed_generator,index_generator,0,ca) -transformGenerator {gen_kind=IsListGenerator, gen_expr, gen_pattern, gen_position} qual_filename index_generator ca +transformGenerator {gen_kind, gen_expr, gen_pattern, gen_position} qual_filename index_generator ca # (list, ca) = prefixAndPositionToIdentExp "g_l" gen_position ca (hd, ca) = prefixAndPositionToIdentExp "g_h" gen_position ca (tl, ca) = prefixAndPositionToIdentExp "g_t" gen_position ca (gen_var_case1, ca) = prefixAndPositionToIdent "g_c1" gen_position ca (gen_var_case2, ca) = prefixAndPositionToIdent "g_c2" gen_position ca - (cons, ca) = makeLazyConsExpression hd tl ca + (cons, ca) = makeConsExpressionForGenerator gen_kind hd tl ca # transformed_generator = { tg_expr = ([],[gen_expr]) , tg_lhs_arg = [list] @@ -543,68 +605,6 @@ transformGenerator {gen_kind=IsListGenerator, gen_expr, gen_pattern, gen_positio , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 } = (transformed_generator,index_generator,0,ca) -transformGenerator {gen_kind=IsArrayGenerator, gen_expr, gen_pattern, gen_position} qual_filename index_generator ca - # (array, ca) = prefixAndPositionToIdentExp "g_a" gen_position ca - (n, ca) = prefixAndPositionToIdentExp "g_s" gen_position ca - (n2, ca) = prefixAndPositionToIdentExp "g_s2" gen_position ca - (a2, ca) = prefixAndPositionToIdentExp "g_a2" gen_position ca - (gen_var_case1, ca) = prefixAndPositionToIdent "g_c1" gen_position ca - (gen_var_case2, ca) = prefixAndPositionToIdent "g_c2" gen_position ca - (less_or_equal, ca) = get_predef_id PD_LessOrEqualFun ca - (sub, ca) = get_predef_id PD_SubFun ca - (usize, ca) = get_predef_id PD_UnqArraySizeFun ca - (uselect, ca) = get_predef_id PD_UnqArraySelectFun ca - pattern = PE_Tuple [gen_pattern, array] - = case index_generator of - No - # (i, ca) = prefixAndPositionToIdentExp "g_i" gen_position ca - (inc, ca) = get_predef_id PD_IncFun ca - # dec_n = PE_List [n,PE_Ident sub,PE_Basic (BVI "1")] - # transformed_generator - = { tg_expr = ([PD_NodeDef (LinePos qual_filename gen_position.lc_line) (PE_Tuple [n,a2]) (exprToRhs (PE_List [PE_Ident usize, gen_expr]))], - [PE_Basic (BVI "0"),dec_n,a2]) - , tg_lhs_arg = [i, n, array] - , tg_case_end_expr = PE_List [i,PE_Ident less_or_equal, n] - , tg_case_end_pattern = PE_Basic (BVB True) - , tg_element = PE_List [PE_Ident uselect, array, i] - , tg_element_is_uselect=True - , tg_pattern = pattern - , tg_rhs_continuation = [PE_List [PE_Ident inc, i], n, array] - , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 - } - -> (transformed_generator,Yes (i,[([],dec_n,n2)]),2,ca) - Yes (i,[]) - # (inc, ca) = get_predef_id PD_IncFun ca - # dec_n = PE_List [n,PE_Ident sub,PE_Basic (BVI "1")] - # transformed_generator - = { tg_expr = ([PD_NodeDef (LinePos qual_filename gen_position.lc_line) (PE_Tuple [n,a2]) (exprToRhs (PE_List [PE_Ident usize, gen_expr]))], - [dec_n,a2]) - , tg_lhs_arg = [n,array] - , tg_case_end_expr = PE_List [i,PE_Ident less_or_equal, n] - , tg_case_end_pattern = PE_Basic (BVB True) - , tg_element = PE_List [PE_Ident uselect, array, i] - , tg_element_is_uselect=True - , tg_pattern = pattern - , tg_rhs_continuation = [n,array] - , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 - } - -> (transformed_generator,Yes (i,[([],dec_n,n2)]),1,ca) - Yes (i,size_expressions) - # transformed_generator - = { tg_expr = ([],[a2]) - , tg_lhs_arg = [array] - , tg_case_end_expr = PE_Empty - , tg_case_end_pattern = PE_Empty - , tg_element = PE_List [PE_Ident uselect, array, i] - , tg_element_is_uselect=True - , tg_pattern = pattern - , tg_rhs_continuation = [array] - , tg_case1 = gen_var_case1, tg_case2 = gen_var_case2 - } - # size_expression - =([PD_NodeDef (LinePos qual_filename gen_position.lc_line) (PE_Tuple [n,a2]) (exprToRhs (PE_List [PE_Ident usize, gen_expr]))], - (PE_List [n,PE_Ident sub,PE_Basic (BVI "1")]),n2) - -> (transformed_generator,Yes (i,[size_expression:size_expressions]),0,ca) transformGenerators :: [Generator] String IndexGenerator *CollectAdmin -> (![TransformedGenerator],!IndexGenerator,!*CollectAdmin) transformGenerators [generator:generators] qual_filename index_generator ca diff --git a/frontend/scanner.dcl b/frontend/scanner.dcl index cfb2acd..dd25d2c 100644 --- a/frontend/scanner.dcl +++ b/frontend/scanner.dcl @@ -48,6 +48,7 @@ instance <<< FilePosition | DoubleBackSlashToken // \\ | LeftArrowToken // <- | LeftArrowColonToken // <-: + | LeftArrowWithBarToken // <|- | DotDotToken // .. | AndToken // & | HashToken // # diff --git a/frontend/scanner.icl b/frontend/scanner.icl index 0df9ee7..911a127 100644 --- a/frontend/scanner.icl +++ b/frontend/scanner.icl @@ -135,6 +135,7 @@ ScanOptionNoNewOffsideForSeqLetBit:==4; | DoubleBackSlashToken // \\ | LeftArrowToken // <- | LeftArrowColonToken // <-: + | LeftArrowWithBarToken // <|- | DotDotToken // .. | AndToken // & | HashToken // # @@ -660,7 +661,20 @@ Scan c0=:'<' input TypeContext Scan c0=:'<' input co # (eof, c1, input) = ReadNormalChar input | eof = (IdentToken "<", input) - | c1 <> '-' = ScanOperator 0 (charBack input) [c0] co + | c1 <> '-' + | c1<>'|' + = ScanOperator 0 (charBack input) [c0] co + # (eof, c2, input) = ReadNormalChar input + | eof + = (IdentToken "<|",input) + | c2=='-' + # (eof, c3, input) = ReadNormalChar input + | eof = (LeftArrowWithBarToken, input) + | isSpecialChar c3 = ScanOperator 3 input [c3, c2, c1, c0] co + = (LeftArrowWithBarToken, charBack input) + | isSpecialChar c2 + = ScanOperator 2 input [c2, c1, c0] co + = (IdentToken "<|", charBack input) # (eof, c2, input) = ReadNormalChar input | eof = (LeftArrowToken, input) | c2 == ':' @@ -1341,6 +1355,7 @@ where toString DoubleBackSlashToken = "\\\\" toString LeftArrowToken = "<-" toString LeftArrowColonToken = "<-:" + toString LeftArrowWithBarToken = "<|-" toString DotDotToken = ".." toString AndToken = "&" toString HashToken = "#" diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index 1a3a345..fed82c2 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -1034,10 +1034,7 @@ cNonUniqueSelection :== False | PS_Array !ParsedExpr | PS_Erroneous -:: GeneratorKind :== Bool - -IsListGenerator :== True -IsArrayGenerator :== False +:: GeneratorKind = IsListGenerator | IsOverloadedListGenerator | IsArrayGenerator :: LineAndColumn = {lc_line :: !Int, lc_column :: !Int} diff --git a/frontend/syntax.icl b/frontend/syntax.icl index 5660068..d343053 100644 --- a/frontend/syntax.icl +++ b/frontend/syntax.icl @@ -1010,11 +1010,7 @@ cNonUniqueSelection :== False | PS_Array !ParsedExpr | PS_Erroneous - -:: GeneratorKind :== Bool - -IsListGenerator :== True -IsArrayGenerator :== False +:: GeneratorKind = IsListGenerator | IsOverloadedListGenerator | IsArrayGenerator :: LineAndColumn = {lc_line :: !Int, lc_column :: !Int} @@ -1484,7 +1480,11 @@ where instance <<< Generator where (<<<) file {gen_kind,gen_pattern,gen_expr} - = file <<< gen_pattern <<< (if gen_kind "<-" "<-:") <<< gen_expr + = file <<< gen_pattern <<< (gen_kind_to_string gen_kind) <<< gen_expr + where + gen_kind_to_string IsListGenerator = "<-" + gen_kind_to_string IsOverloadedListGenerator = "<|-" + gen_kind_to_string IsArrayGenerator = "<-:" instance <<< BasicValue where |