Skip to content

Commit c1c28a5

Browse files
committed
Replace epsilon regex with an empty string.
1 parent dd269b1 commit c1c28a5

File tree

3 files changed

+1561
-1560
lines changed

3 files changed

+1561
-1560
lines changed

uni/unicon/unigram.icn

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2646,7 +2646,7 @@ procedure init_stacks()
26462646
every i := 1 to 1000 do action[i] := proc("action_" || i)
26472647
end
26482648

2649-
#line 936 "unigram.y"
2649+
#line 937 "unigram.y"
26502650

26512651
#
26522652
# This procedure parenthesizes the right-hand side of an expression,
@@ -4725,42 +4725,42 @@ procedure action_277()
47254725
end
47264726

47274727
procedure action_282()
4728-
#line 803 "unigram.y"
4728+
#line 804 "unigram.y"
47294729
yyval := regexp(valstk[1])
47304730
end
47314731

47324732
procedure action_283()
4733-
#line 804 "unigram.y"
4734-
yyval := "emptyregex"
4733+
#line 805 "unigram.y"
4734+
yyval := "\"\""
47354735
end
47364736

47374737
procedure action_285()
4738-
#line 809 "unigram.y"
4738+
#line 810 "unigram.y"
47394739
yyval := node("regexbar", valstk[3], valstk[2], valstk[1])
47404740
end
47414741

47424742
procedure action_287()
4743-
#line 813 "unigram.y"
4743+
#line 814 "unigram.y"
47444744
yyval := node("regexconcat", valstk[2], valstk[1])
47454745
end
47464746

47474747
procedure action_289()
4748-
#line 817 "unigram.y"
4748+
#line 818 "unigram.y"
47494749
yyval := node("kleene", valstk[2], valstk[1])
47504750
end
47514751

47524752
procedure action_290()
4753-
#line 818 "unigram.y"
4753+
#line 819 "unigram.y"
47544754
yyval := node("oneormore", valstk[2], valstk[1])
47554755
end
47564756

47574757
procedure action_291()
4758-
#line 819 "unigram.y"
4758+
#line 820 "unigram.y"
47594759
yyval := node("optional", valstk[2], valstk[1])
47604760
end
47614761

47624762
procedure action_292()
4763-
#line 820 "unigram.y"
4763+
#line 821 "unigram.y"
47644764

47654765
if valstk[2].s < 0 then {
47664766
yyerror("regex occurrences may not be negative")
@@ -4781,27 +4781,27 @@ procedure action_292()
47814781
end
47824782

47834783
procedure action_294()
4784-
#line 840 "unigram.y"
4784+
#line 841 "unigram.y"
47854785
yyval := valstk[1]; yyval.tok := IDENT
47864786
end
47874787

47884788
procedure action_295()
4789-
#line 841 "unigram.y"
4789+
#line 842 "unigram.y"
47904790
yyval := valstk[1]; yyval.tok := IDENT
47914791
end
47924792

47934793
procedure action_296()
4794-
#line 842 "unigram.y"
4794+
#line 843 "unigram.y"
47954795
yyval := valstk[1]; yyval.tok := IDENT
47964796
end
47974797

47984798
procedure action_302()
4799-
#line 848 "unigram.y"
4799+
#line 849 "unigram.y"
48004800
yyval := node("Paren",valstk[3],valstk[2],valstk[1])
48014801
end
48024802

48034803
procedure action_303()
4804-
#line 849 "unigram.y"
4804+
#line 850 "unigram.y"
48054805

48064806
yyval := node("acset", valstk[3], valstk[2], valstk[1])
48074807
if type(valstk[2]) == "token" then {
@@ -4816,17 +4816,17 @@ procedure action_303()
48164816
end
48174817

48184818
procedure action_304()
4819-
#line 860 "unigram.y"
4819+
#line 861 "unigram.y"
48204820
yyval := node("notany", valstk[4], valstk[3], valstk[2], valstk[1])
48214821
end
48224822

48234823
procedure action_305()
4824-
#line 861 "unigram.y"
4824+
#line 862 "unigram.y"
48254825
yyval := node("escape", valstk[2], valstk[1])
48264826
end
48274827

48284828
procedure action_307()
4829-
#line 865 "unigram.y"
4829+
#line 866 "unigram.y"
48304830

48314831
# sometimes a MINUS is just a MINUS
48324832
if type(valstk[1]) == "treenode" then {
@@ -4844,12 +4844,12 @@ procedure action_307()
48444844
end
48454845

48464846
procedure action_308()
4847-
#line 879 "unigram.y"
4847+
#line 880 "unigram.y"
48484848
yyval := node("brackchars", valstk[3], valstk[2], valstk[1])
48494849
end
48504850

48514851
procedure action_309()
4852-
#line 880 "unigram.y"
4852+
#line 881 "unigram.y"
48534853

48544854
#
48554855
# build yyval result that is a token with yyval.s being the cset
@@ -4874,7 +4874,7 @@ procedure action_309()
48744874
end
48754875

48764876
procedure action_315()
4877-
#line 904 "unigram.y"
4877+
#line 905 "unigram.y"
48784878
# ordinary escape char
48794879
yyval := valstk[1]
48804880
yyval.column := valstk[2].column
@@ -4886,7 +4886,7 @@ procedure action_315()
48864886
end
48874887

48884888
procedure action_316()
4889-
#line 912 "unigram.y"
4889+
#line 913 "unigram.y"
48904890
#escaped octal?
48914891
yyval := valstk[1]
48924892
yyval.column := valstk[2].column
@@ -4898,22 +4898,22 @@ procedure action_316()
48984898
end
48994899

49004900
procedure action_317()
4901-
#line 922 "unigram.y"
4901+
#line 923 "unigram.y"
49024902
yyval := node("section", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
49034903
end
49044904

49054905
procedure action_322()
4906-
#line 929 "unigram.y"
4906+
#line 930 "unigram.y"
49074907
yyval := node("compound", valstk[3],";",valstk[1])
49084908
end
49094909

49104910
procedure action_324()
4911-
#line 932 "unigram.y"
4911+
#line 933 "unigram.y"
49124912
yyval := node("error", valstk[4],valstk[2],valstk[1])
49134913
end
49144914

49154915
procedure action_325()
4916-
#line 933 "unigram.y"
4916+
#line 934 "unigram.y"
49174917
yyval := node("error")
49184918
end
49194919

0 commit comments

Comments
 (0)