Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | pt::parse::peg (C) - Updated with the fixes to the C generator. Updated all testsuite results with the same fixes. |
---|---|
Timelines: | family | ancestors | descendants | both | pt-work |
Files: | files | file ages | folders |
SHA1: |
af55e30def8a29bfe46d610387615f0d |
User & Date: | aku 2014-06-28 21:18:58 |
Original Comment: | pt::parse::peg (C) - Updated with the fixes to the C generator. |
2014-07-21
| ||
18:57 | Merged work on the parsetools into trunk. Very extended testsuite, and lots of bugfixes, especially in the area of error handling. Also fixes in the C runtime and generated code where long/void* size mismatches caused crashing. check-in: 598ddec2b2 user: andreask tags: trunk | |
2014-06-28
| ||
21:41 | Bring examples up to date with latest parser fixes and changes. check-in: 75d8a9a9c7 user: aku tags: pt-examples | |
21:18 | pt::parse::peg (C) - Updated with the fixes to the C generator. Updated all testsuite results with the same fixes. Closed-Leaf check-in: af55e30def user: aku tags: pt-work | |
21:17 | pt::rdengine (C) - Fixed the generation of error messages by the dynamic C runtime, i.e. made it generate proper lists. check-in: 5eca9d6009 user: aku tags: pt-work | |
Changes to modules/pt/pt_parse_peg_c.tcl.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1900 1901 1902 1903 1904 1905 1906 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", | | | | | | | | | 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", /* 33 = */ "t \\\\", /* 34 = */ ".. 0 2", /* 35 = */ ".. 0 7", /* 36 = */ "n CharOctalFull", /* 37 = */ "CharOctalFull", /* 38 = */ "n CharOctalPart", /* 39 = */ "CharOctalPart", /* 40 = */ "cl nrt'\\\"\\[\\]\\\\", /* 41 = */ "n CharSpecial", /* 42 = */ "CharSpecial", /* 43 = */ "dot", /* 44 = */ "n CharUnescaped", /* 45 = */ "CharUnescaped", /* 46 = */ "str \173\\u\175", /* 47 = */ "n CharUnicode", /* 48 = */ "CharUnicode", /* 49 = */ "n Class", /* 50 = */ "Class", /* 51 = */ "t )", /* 52 = */ "n CLOSE", /* 53 = */ "CLOSE", /* 54 = */ "t \\]", /* 55 = */ "n CLOSEB", /* 56 = */ "CLOSEB", /* 57 = */ "t :", /* 58 = */ "n COLON", /* 59 = */ "COLON", /* 60 = */ "t #", /* 61 = */ "n COMMENT", /* 62 = */ "COMMENT", /* 63 = */ "str <control>", /* 64 = */ "n CONTROL", /* 65 = */ "CONTROL", /* 66 = */ "t \173\"\175", /* 67 = */ "n DAPOSTROPH", /* 68 = */ "DAPOSTROPH", /* 69 = */ "str <ddigit>", /* 70 = */ "n DDIGIT", /* 71 = */ "DDIGIT", /* 72 = */ "n Definition", /* 73 = */ "Definition", /* 74 = */ "str <digit>", /* 75 = */ "n DIGIT", /* 76 = */ "DIGIT", /* 77 = */ "t .", /* 78 = */ "n DOT", /* 79 = */ "DOT", /* 80 = */ "n EOF", /* 81 = */ "EOF", /* 82 = */ "cl \173\n\r\175", /* 83 = */ "n EOL", /* 84 = */ "EOL", /* 85 = */ "n Expression", /* 86 = */ "Expression", /* 87 = */ "str END", /* 88 = */ "n Final", /* 89 = */ "Final", |
︙ | ︙ | |||
1983 1984 1985 1986 1987 1988 1989 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", | | | | 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", /* 116 = */ "t (", /* 117 = */ "n OPEN", /* 118 = */ "OPEN", /* 119 = */ "t \173[\175", /* 120 = */ "n OPENB", /* 121 = */ "OPENB", /* 122 = */ "str PEG", /* 123 = */ "n PEG", /* 124 = */ "PEG", /* 125 = */ "t +", /* 126 = */ "n PLUS", |
︙ | ︙ | |||
2010 2011 2012 2013 2014 2015 2016 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", | | | 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", /* 143 = */ "t \173;\175", /* 144 = */ "n SEMICOLON", /* 145 = */ "SEMICOLON", /* 146 = */ "n Sequence", /* 147 = */ "Sequence", /* 148 = */ "t /", /* 149 = */ "n SLASH", /* 150 = */ "SLASH", |
︙ | ︙ | |||
2323 2324 2325 2326 2327 2328 2329 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (p); | | | 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "2", 34); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); rde_param_i_state_merge_void (p); |
︙ | ︙ | |||
2363 2364 2365 2366 2367 2368 2369 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (p); | | | 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); if (rde_param_i_seq_void2void(p)) return; optional_50 (p); rde_param_i_state_merge_void (p); return; } |
︙ | ︙ | |||
2409 2410 2411 2412 2413 2414 2415 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (p); | | | | 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_class (p, "nrt'\"[]\\", 40); rde_param_i_state_merge_void (p); return; } /* * leaf Symbol 'CharUnescaped' */ |
︙ | ︙ | |||
2457 2458 2459 2460 2461 2462 2463 | static void notahead_61 (RDE_PARAM p) { /* * ! * '\' */ rde_param_i_loc_push (p); | | | 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 | static void notahead_61 (RDE_PARAM p) { /* * ! * '\' */ rde_param_i_loc_push (p); rde_param_i_next_char (p, "\\", 33); rde_param_i_notahead_exit (p); return; } /* * leaf Symbol 'CharUnicode' */ |
︙ | ︙ | |||
2503 2504 2505 2506 2507 2508 2509 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (p); | | | 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "\\u", 46); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_xdigit (p, 13); if (rde_param_i_seq_void2void(p)) return; optional_80 (p); rde_param_i_state_merge_void (p); return; } |
︙ | ︙ | |||
2710 2711 2712 2713 2714 2715 2716 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | | 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, ")", 51); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* * void Symbol 'CLOSEB' */ static void sym_CLOSEB (RDE_PARAM p) { /* * ']' */ if (rde_param_i_symbol_void_start (p, 56)) return ; rde_param_i_next_char (p, "]", 54); rde_param_i_symbol_done_void (p, 56, 55); return; } /* * void Symbol 'COLON' */ |
︙ | ︙ | |||
2895 2896 2897 2898 2899 2900 2901 | static void sym_DAPOSTROPH (RDE_PARAM p) { /* * '\"' */ if (rde_param_i_symbol_void_start (p, 68)) return ; | | | 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 | static void sym_DAPOSTROPH (RDE_PARAM p) { /* * '\"' */ if (rde_param_i_symbol_void_start (p, 68)) return ; rde_param_i_next_char (p, "\"", 66); rde_param_i_symbol_done_void (p, 68, 67); return; } /* * leaf Symbol 'DDIGIT' */ |
︙ | ︙ | |||
3811 3812 3813 3814 3815 3816 3817 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | | 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 116); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* * void Symbol 'OPENB' */ static void sym_OPENB (RDE_PARAM p) { /* * '[' */ if (rde_param_i_symbol_void_start (p, 121)) return ; rde_param_i_next_char (p, "[", 119); rde_param_i_symbol_done_void (p, 121, 120); return; } /* * void Symbol 'PEG' */ |
︙ | ︙ | |||
4289 4290 4291 4292 4293 4294 4295 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, ";", 143); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* |
︙ | ︙ |
Changes to modules/pt/tests/char.tests.
︙ | ︙ | |||
125 126 127 128 129 130 131 | } -result A test char-4.2 {char cstring, multi char} -body { char quote cstring A B } -result {A B} foreach {n label input expected} { | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | } -result A test char-4.2 {char cstring, multi char} -body { char quote cstring A B } -result {A B} foreach {n label input expected} { 0 obrace \{ \\173 1 obrckt \[ \[ 2 dquote \" \\\" 3 escape \033 \\33 4 lf \n \\n 5 space { } { } 6 backslash \\ \\\\ 7 A A A |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1756 1757 1758 1759 1760 1761 1762 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", | | | | 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", /* 20 = */ "t (", /* 21 = */ "t )", /* 22 = */ "n Expression", /* 23 = */ "Expression", /* 24 = */ "n Factor", /* 25 = */ "Factor", /* 26 = */ "cl */", /* 27 = */ "n MulOp", /* 28 = */ "MulOp", |
︙ | ︙ | |||
1869 1870 1871 1872 1873 1874 1875 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 20); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 21); rde_param_i_state_merge_value (p); return; } static void sequence_18 (RDE_PARAM p) { /* * x |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/1_functions.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1739 1740 1741 1742 1743 1744 1745 | /* 11 = */ "upper", /* 12 = */ "wordchar", /* 13 = */ "xdigit", /* 14 = */ "n Expression", /* 15 = */ "Expression", /* 16 = */ "n Function", /* 17 = */ "Function", | | | | 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 | /* 11 = */ "upper", /* 12 = */ "wordchar", /* 13 = */ "xdigit", /* 14 = */ "n Expression", /* 15 = */ "Expression", /* 16 = */ "n Function", /* 17 = */ "Function", /* 18 = */ "str sin(", /* 19 = */ "t )", /* 20 = */ "n Sinus", /* 21 = */ "Sinus" }; /* * Grammar Start Expression */ |
︙ | ︙ | |||
1811 1812 1813 1814 1815 1816 1817 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "sin(", 18); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 19); rde_param_i_state_merge_value (p); return; } } ## END of GENERATED CODE. DO NOT EDIT. |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/2_fun_arithmetic.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1759 1760 1761 1762 1763 1764 1765 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", | | | | | 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", /* 20 = */ "t (", /* 21 = */ "t )", /* 22 = */ "n Expression", /* 23 = */ "Expression", /* 24 = */ "n Factor", /* 25 = */ "Factor", /* 26 = */ "n Function", /* 27 = */ "Function", /* 28 = */ "cl */", /* 29 = */ "n MulOp", /* 30 = */ "MulOp", /* 31 = */ "n Number", /* 32 = */ "Number", /* 33 = */ "n Sign", /* 34 = */ "Sign", /* 35 = */ "str sin(", /* 36 = */ "n Sinus", /* 37 = */ "Sinus", /* 38 = */ "n Term", /* 39 = */ "Term" }; /* |
︙ | ︙ | |||
1881 1882 1883 1884 1885 1886 1887 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 20); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 21); rde_param_i_state_merge_value (p); return; } static void sequence_19 (RDE_PARAM p) { /* * x |
︙ | ︙ | |||
2145 2146 2147 2148 2149 2150 2151 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "sin(", 35); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 21); rde_param_i_state_merge_value (p); return; } /* * value Symbol 'Term' */ |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/3_peg_itself.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1900 1901 1902 1903 1904 1905 1906 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", | | | | | | | | | 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", /* 33 = */ "t \\\\", /* 34 = */ ".. 0 2", /* 35 = */ ".. 0 7", /* 36 = */ "n CharOctalFull", /* 37 = */ "CharOctalFull", /* 38 = */ "n CharOctalPart", /* 39 = */ "CharOctalPart", /* 40 = */ "cl nrt'\\\"\\[\\]\\\\", /* 41 = */ "n CharSpecial", /* 42 = */ "CharSpecial", /* 43 = */ "dot", /* 44 = */ "n CharUnescaped", /* 45 = */ "CharUnescaped", /* 46 = */ "str \173\\u\175", /* 47 = */ "n CharUnicode", /* 48 = */ "CharUnicode", /* 49 = */ "n Class", /* 50 = */ "Class", /* 51 = */ "t )", /* 52 = */ "n CLOSE", /* 53 = */ "CLOSE", /* 54 = */ "t \\]", /* 55 = */ "n CLOSEB", /* 56 = */ "CLOSEB", /* 57 = */ "t :", /* 58 = */ "n COLON", /* 59 = */ "COLON", /* 60 = */ "t #", /* 61 = */ "n COMMENT", /* 62 = */ "COMMENT", /* 63 = */ "str <control>", /* 64 = */ "n CONTROL", /* 65 = */ "CONTROL", /* 66 = */ "t \173\"\175", /* 67 = */ "n DAPOSTROPH", /* 68 = */ "DAPOSTROPH", /* 69 = */ "str <ddigit>", /* 70 = */ "n DDIGIT", /* 71 = */ "DDIGIT", /* 72 = */ "n Definition", /* 73 = */ "Definition", /* 74 = */ "str <digit>", /* 75 = */ "n DIGIT", /* 76 = */ "DIGIT", /* 77 = */ "t .", /* 78 = */ "n DOT", /* 79 = */ "DOT", /* 80 = */ "n EOF", /* 81 = */ "EOF", /* 82 = */ "cl \173\n\r\175", /* 83 = */ "n EOL", /* 84 = */ "EOL", /* 85 = */ "n Expression", /* 86 = */ "Expression", /* 87 = */ "str END", /* 88 = */ "n Final", /* 89 = */ "Final", |
︙ | ︙ | |||
1983 1984 1985 1986 1987 1988 1989 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", | | | | 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", /* 116 = */ "t (", /* 117 = */ "n OPEN", /* 118 = */ "OPEN", /* 119 = */ "t \173[\175", /* 120 = */ "n OPENB", /* 121 = */ "OPENB", /* 122 = */ "str PEG", /* 123 = */ "n PEG", /* 124 = */ "PEG", /* 125 = */ "t +", /* 126 = */ "n PLUS", |
︙ | ︙ | |||
2010 2011 2012 2013 2014 2015 2016 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", | | | 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", /* 143 = */ "t \173;\175", /* 144 = */ "n SEMICOLON", /* 145 = */ "SEMICOLON", /* 146 = */ "n Sequence", /* 147 = */ "Sequence", /* 148 = */ "t /", /* 149 = */ "n SLASH", /* 150 = */ "SLASH", |
︙ | ︙ | |||
2323 2324 2325 2326 2327 2328 2329 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (p); | | | 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "2", 34); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); rde_param_i_state_merge_void (p); |
︙ | ︙ | |||
2363 2364 2365 2366 2367 2368 2369 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (p); | | | 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); if (rde_param_i_seq_void2void(p)) return; optional_50 (p); rde_param_i_state_merge_void (p); return; } |
︙ | ︙ | |||
2409 2410 2411 2412 2413 2414 2415 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (p); | | | | 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_class (p, "nrt'\"[]\\", 40); rde_param_i_state_merge_void (p); return; } /* * leaf Symbol 'CharUnescaped' */ |
︙ | ︙ | |||
2457 2458 2459 2460 2461 2462 2463 | static void notahead_61 (RDE_PARAM p) { /* * ! * '\' */ rde_param_i_loc_push (p); | | | 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 | static void notahead_61 (RDE_PARAM p) { /* * ! * '\' */ rde_param_i_loc_push (p); rde_param_i_next_char (p, "\\", 33); rde_param_i_notahead_exit (p); return; } /* * leaf Symbol 'CharUnicode' */ |
︙ | ︙ | |||
2503 2504 2505 2506 2507 2508 2509 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (p); | | | 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "\\u", 46); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_xdigit (p, 13); if (rde_param_i_seq_void2void(p)) return; optional_80 (p); rde_param_i_state_merge_void (p); return; } |
︙ | ︙ | |||
2710 2711 2712 2713 2714 2715 2716 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | | 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, ")", 51); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* * void Symbol 'CLOSEB' */ static void sym_CLOSEB (RDE_PARAM p) { /* * ']' */ if (rde_param_i_symbol_void_start (p, 56)) return ; rde_param_i_next_char (p, "]", 54); rde_param_i_symbol_done_void (p, 56, 55); return; } /* * void Symbol 'COLON' */ |
︙ | ︙ | |||
2895 2896 2897 2898 2899 2900 2901 | static void sym_DAPOSTROPH (RDE_PARAM p) { /* * '\"' */ if (rde_param_i_symbol_void_start (p, 68)) return ; | | | 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 | static void sym_DAPOSTROPH (RDE_PARAM p) { /* * '\"' */ if (rde_param_i_symbol_void_start (p, 68)) return ; rde_param_i_next_char (p, "\"", 66); rde_param_i_symbol_done_void (p, 68, 67); return; } /* * leaf Symbol 'DDIGIT' */ |
︙ | ︙ | |||
3811 3812 3813 3814 3815 3816 3817 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | | 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 116); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* * void Symbol 'OPENB' */ static void sym_OPENB (RDE_PARAM p) { /* * '[' */ if (rde_param_i_symbol_void_start (p, 121)) return ; rde_param_i_next_char (p, "[", 119); rde_param_i_symbol_done_void (p, 121, 120); return; } /* * void Symbol 'PEG' */ |
︙ | ︙ | |||
4289 4290 4291 4292 4293 4294 4295 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, ";", 143); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/4_choice.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/5_sequence.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/6_optional.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/7_kleene.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/8_pkleene.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-critcl/9_ahead.
︙ | ︙ | |||
933 934 935 936 937 938 939 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/0_basic_arithmetic.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1715 1716 1717 1718 1719 1720 1721 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", | | | | 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", /* 20 = */ "t (", /* 21 = */ "t )", /* 22 = */ "n Expression", /* 23 = */ "Expression", /* 24 = */ "n Factor", /* 25 = */ "Factor", /* 26 = */ "cl */", /* 27 = */ "n MulOp", /* 28 = */ "MulOp", |
︙ | ︙ | |||
1828 1829 1830 1831 1832 1833 1834 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 20); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 21); rde_param_i_state_merge_value (p); return; } static void sequence_18 (RDE_PARAM p) { /* * x |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/10_notahead.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/11_epsilon.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/1_functions.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1698 1699 1700 1701 1702 1703 1704 | /* 11 = */ "upper", /* 12 = */ "wordchar", /* 13 = */ "xdigit", /* 14 = */ "n Expression", /* 15 = */ "Expression", /* 16 = */ "n Function", /* 17 = */ "Function", | | | | 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 | /* 11 = */ "upper", /* 12 = */ "wordchar", /* 13 = */ "xdigit", /* 14 = */ "n Expression", /* 15 = */ "Expression", /* 16 = */ "n Function", /* 17 = */ "Function", /* 18 = */ "str sin(", /* 19 = */ "t )", /* 20 = */ "n Sinus", /* 21 = */ "Sinus" }; /* * Grammar Start Expression */ |
︙ | ︙ | |||
1770 1771 1772 1773 1774 1775 1776 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "sin(", 18); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 19); rde_param_i_state_merge_value (p); return; } /* -*- c -*- */ typedef struct PARSERg { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/2_fun_arithmetic.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1718 1719 1720 1721 1722 1723 1724 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", | | | | | 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", /* 20 = */ "t (", /* 21 = */ "t )", /* 22 = */ "n Expression", /* 23 = */ "Expression", /* 24 = */ "n Factor", /* 25 = */ "Factor", /* 26 = */ "n Function", /* 27 = */ "Function", /* 28 = */ "cl */", /* 29 = */ "n MulOp", /* 30 = */ "MulOp", /* 31 = */ "n Number", /* 32 = */ "Number", /* 33 = */ "n Sign", /* 34 = */ "Sign", /* 35 = */ "str sin(", /* 36 = */ "n Sinus", /* 37 = */ "Sinus", /* 38 = */ "n Term", /* 39 = */ "Term" }; /* |
︙ | ︙ | |||
1840 1841 1842 1843 1844 1845 1846 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 20); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 21); rde_param_i_state_merge_value (p); return; } static void sequence_19 (RDE_PARAM p) { /* * x |
︙ | ︙ | |||
2104 2105 2106 2107 2108 2109 2110 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); | | | | 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "sin(", 35); if (rde_param_i_seq_void2value(p)) return; sym_Expression (p); if (rde_param_i_seq_value2value(p)) return; rde_param_i_next_char (p, ")", 21); rde_param_i_state_merge_value (p); return; } /* * value Symbol 'Term' */ |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/3_peg_itself.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ | |||
1859 1860 1861 1862 1863 1864 1865 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", | | | | | | | | | 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", /* 33 = */ "t \\\\", /* 34 = */ ".. 0 2", /* 35 = */ ".. 0 7", /* 36 = */ "n CharOctalFull", /* 37 = */ "CharOctalFull", /* 38 = */ "n CharOctalPart", /* 39 = */ "CharOctalPart", /* 40 = */ "cl nrt'\\\"\\[\\]\\\\", /* 41 = */ "n CharSpecial", /* 42 = */ "CharSpecial", /* 43 = */ "dot", /* 44 = */ "n CharUnescaped", /* 45 = */ "CharUnescaped", /* 46 = */ "str \173\\u\175", /* 47 = */ "n CharUnicode", /* 48 = */ "CharUnicode", /* 49 = */ "n Class", /* 50 = */ "Class", /* 51 = */ "t )", /* 52 = */ "n CLOSE", /* 53 = */ "CLOSE", /* 54 = */ "t \\]", /* 55 = */ "n CLOSEB", /* 56 = */ "CLOSEB", /* 57 = */ "t :", /* 58 = */ "n COLON", /* 59 = */ "COLON", /* 60 = */ "t #", /* 61 = */ "n COMMENT", /* 62 = */ "COMMENT", /* 63 = */ "str <control>", /* 64 = */ "n CONTROL", /* 65 = */ "CONTROL", /* 66 = */ "t \173\"\175", /* 67 = */ "n DAPOSTROPH", /* 68 = */ "DAPOSTROPH", /* 69 = */ "str <ddigit>", /* 70 = */ "n DDIGIT", /* 71 = */ "DDIGIT", /* 72 = */ "n Definition", /* 73 = */ "Definition", /* 74 = */ "str <digit>", /* 75 = */ "n DIGIT", /* 76 = */ "DIGIT", /* 77 = */ "t .", /* 78 = */ "n DOT", /* 79 = */ "DOT", /* 80 = */ "n EOF", /* 81 = */ "EOF", /* 82 = */ "cl \173\n\r\175", /* 83 = */ "n EOL", /* 84 = */ "EOL", /* 85 = */ "n Expression", /* 86 = */ "Expression", /* 87 = */ "str END", /* 88 = */ "n Final", /* 89 = */ "Final", |
︙ | ︙ | |||
1942 1943 1944 1945 1946 1947 1948 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", | | | | 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", /* 116 = */ "t (", /* 117 = */ "n OPEN", /* 118 = */ "OPEN", /* 119 = */ "t \173[\175", /* 120 = */ "n OPENB", /* 121 = */ "OPENB", /* 122 = */ "str PEG", /* 123 = */ "n PEG", /* 124 = */ "PEG", /* 125 = */ "t +", /* 126 = */ "n PLUS", |
︙ | ︙ | |||
1969 1970 1971 1972 1973 1974 1975 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", | | | 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", /* 143 = */ "t \173;\175", /* 144 = */ "n SEMICOLON", /* 145 = */ "SEMICOLON", /* 146 = */ "n Sequence", /* 147 = */ "Sequence", /* 148 = */ "t /", /* 149 = */ "n SLASH", /* 150 = */ "SLASH", |
︙ | ︙ | |||
2282 2283 2284 2285 2286 2287 2288 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (p); | | | 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "2", 34); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); rde_param_i_state_merge_void (p); |
︙ | ︙ | |||
2322 2323 2324 2325 2326 2327 2328 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (p); | | | 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_range (p, "0", "7", 35); if (rde_param_i_seq_void2void(p)) return; optional_50 (p); rde_param_i_state_merge_void (p); return; } |
︙ | ︙ | |||
2368 2369 2370 2371 2372 2373 2374 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (p); | | | | 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "\\", 33); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_class (p, "nrt'\"[]\\", 40); rde_param_i_state_merge_void (p); return; } /* * leaf Symbol 'CharUnescaped' */ |
︙ | ︙ | |||
2416 2417 2418 2419 2420 2421 2422 | static void notahead_61 (RDE_PARAM p) { /* * ! * '\' */ rde_param_i_loc_push (p); | | | 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 | static void notahead_61 (RDE_PARAM p) { /* * ! * '\' */ rde_param_i_loc_push (p); rde_param_i_next_char (p, "\\", 33); rde_param_i_notahead_exit (p); return; } /* * leaf Symbol 'CharUnicode' */ |
︙ | ︙ | |||
2462 2463 2464 2465 2466 2467 2468 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (p); | | | 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (p); rde_param_i_next_str (p, "\\u", 46); if (rde_param_i_seq_void2void(p)) return; rde_param_i_next_xdigit (p, 13); if (rde_param_i_seq_void2void(p)) return; optional_80 (p); rde_param_i_state_merge_void (p); return; } |
︙ | ︙ | |||
2669 2670 2671 2672 2673 2674 2675 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | | 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, ")", 51); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* * void Symbol 'CLOSEB' */ static void sym_CLOSEB (RDE_PARAM p) { /* * ']' */ if (rde_param_i_symbol_void_start (p, 56)) return ; rde_param_i_next_char (p, "]", 54); rde_param_i_symbol_done_void (p, 56, 55); return; } /* * void Symbol 'COLON' */ |
︙ | ︙ | |||
2854 2855 2856 2857 2858 2859 2860 | static void sym_DAPOSTROPH (RDE_PARAM p) { /* * '\"' */ if (rde_param_i_symbol_void_start (p, 68)) return ; | | | 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 | static void sym_DAPOSTROPH (RDE_PARAM p) { /* * '\"' */ if (rde_param_i_symbol_void_start (p, 68)) return ; rde_param_i_next_char (p, "\"", 66); rde_param_i_symbol_done_void (p, 68, 67); return; } /* * leaf Symbol 'DDIGIT' */ |
︙ | ︙ | |||
3770 3771 3772 3773 3774 3775 3776 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | | 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, "(", 116); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* * void Symbol 'OPENB' */ static void sym_OPENB (RDE_PARAM p) { /* * '[' */ if (rde_param_i_symbol_void_start (p, 121)) return ; rde_param_i_next_char (p, "[", 119); rde_param_i_symbol_done_void (p, 121, 120); return; } /* * void Symbol 'PEG' */ |
︙ | ︙ | |||
4248 4249 4250 4251 4252 4253 4254 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (p); | | | 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (p); rde_param_i_next_char (p, ";", 143); if (rde_param_i_seq_void2void(p)) return; sym_WHITESPACE (p); rde_param_i_state_merge_void (p); return; } /* |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/4_choice.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/5_sequence.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/6_optional.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/7_kleene.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/8_pkleene.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam-tea/9_ahead.
︙ | ︙ | |||
900 901 902 903 904 905 906 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); | > | | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | int leni; char* ch; ASSERT_BOUNDS(m,p->numstr); p->CL ++; if (p->CL < rde_tc_size (p->TC)) { rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len); ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX); p->ST = 1; ER_CLEAR (p); return; } if (!p->IN || Tcl_Eof (p->IN) || (Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) { |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam/0_basic_arithmetic.
︙ | ︙ | |||
49 50 51 52 53 54 55 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", /* 20 = */ "t (", /* 21 = */ "t )", /* 22 = */ "n Expression", /* 23 = */ "Expression", /* 24 = */ "n Factor", /* 25 = */ "Factor", /* 26 = */ "cl */", /* 27 = */ "n MulOp", /* 28 = */ "MulOp", |
︙ | ︙ | |||
162 163 164 165 166 167 168 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); | | | | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, "(", 20); if (rde_param_i_seq_void2value(<<state>>)) return; <<self>> <<ns>>sym_Expression (<<state>>); if (rde_param_i_seq_value2value(<<state>>)) return; rde_param_i_next_char (<<state>>, ")", 21); rde_param_i_state_merge_value (<<state>>); return; } <<attributes>> void <<ns>>sequence_18 (<<STATE>> <<state>>) { <<prelude>> /* * x |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam/1_functions.
︙ | ︙ | |||
32 33 34 35 36 37 38 | /* 11 = */ "upper", /* 12 = */ "wordchar", /* 13 = */ "xdigit", /* 14 = */ "n Expression", /* 15 = */ "Expression", /* 16 = */ "n Function", /* 17 = */ "Function", | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | /* 11 = */ "upper", /* 12 = */ "wordchar", /* 13 = */ "xdigit", /* 14 = */ "n Expression", /* 15 = */ "Expression", /* 16 = */ "n Function", /* 17 = */ "Function", /* 18 = */ "str sin(", /* 19 = */ "t )", /* 20 = */ "n Sinus", /* 21 = */ "Sinus" }; /* * Grammar Start Expression */ |
︙ | ︙ | |||
104 105 106 107 108 109 110 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); | | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_str (<<state>>, "sin(", 18); if (rde_param_i_seq_void2value(<<state>>)) return; <<self>> <<ns>>sym_Expression (<<state>>); if (rde_param_i_seq_value2value(<<state>>)) return; rde_param_i_next_char (<<state>>, ")", 19); rde_param_i_state_merge_value (<<state>>); return; } /* */ |
Changes to modules/pt/tests/data/ok/peg_cparam/2_fun_arithmetic.
︙ | ︙ | |||
52 53 54 55 56 57 58 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", | | | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | /* 13 = */ "xdigit", /* 14 = */ "cl -+", /* 15 = */ "n AddOp", /* 16 = */ "AddOp", /* 17 = */ "cl 0123456789", /* 18 = */ "n Digit", /* 19 = */ "Digit", /* 20 = */ "t (", /* 21 = */ "t )", /* 22 = */ "n Expression", /* 23 = */ "Expression", /* 24 = */ "n Factor", /* 25 = */ "Factor", /* 26 = */ "n Function", /* 27 = */ "Function", /* 28 = */ "cl */", /* 29 = */ "n MulOp", /* 30 = */ "MulOp", /* 31 = */ "n Number", /* 32 = */ "Number", /* 33 = */ "n Sign", /* 34 = */ "Sign", /* 35 = */ "str sin(", /* 36 = */ "n Sinus", /* 37 = */ "Sinus", /* 38 = */ "n Term", /* 39 = */ "Term" }; /* |
︙ | ︙ | |||
174 175 176 177 178 179 180 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); | | | | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | * x * '\(' * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, "(", 20); if (rde_param_i_seq_void2value(<<state>>)) return; <<self>> <<ns>>sym_Expression (<<state>>); if (rde_param_i_seq_value2value(<<state>>)) return; rde_param_i_next_char (<<state>>, ")", 21); rde_param_i_state_merge_value (<<state>>); return; } <<attributes>> void <<ns>>sequence_19 (<<STATE>> <<state>>) { <<prelude>> /* * x |
︙ | ︙ | |||
438 439 440 441 442 443 444 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); | | | | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | * x * "sin\(" * (Expression) * '\)' */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_str (<<state>>, "sin(", 35); if (rde_param_i_seq_void2value(<<state>>)) return; <<self>> <<ns>>sym_Expression (<<state>>); if (rde_param_i_seq_value2value(<<state>>)) return; rde_param_i_next_char (<<state>>, ")", 21); rde_param_i_state_merge_value (<<state>>); return; } /* * value Symbol 'Term' */ |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_cparam/3_peg_itself.
︙ | ︙ | |||
193 194 195 196 197 198 199 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", | | | | | | | | | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | /* 26 = */ "str <ascii>", /* 27 = */ "n ASCII", /* 28 = */ "ASCII", /* 29 = */ "n Attribute", /* 30 = */ "Attribute", /* 31 = */ "n Char", /* 32 = */ "Char", /* 33 = */ "t \\\\", /* 34 = */ ".. 0 2", /* 35 = */ ".. 0 7", /* 36 = */ "n CharOctalFull", /* 37 = */ "CharOctalFull", /* 38 = */ "n CharOctalPart", /* 39 = */ "CharOctalPart", /* 40 = */ "cl nrt'\\\"\\[\\]\\\\", /* 41 = */ "n CharSpecial", /* 42 = */ "CharSpecial", /* 43 = */ "dot", /* 44 = */ "n CharUnescaped", /* 45 = */ "CharUnescaped", /* 46 = */ "str \173\\u\175", /* 47 = */ "n CharUnicode", /* 48 = */ "CharUnicode", /* 49 = */ "n Class", /* 50 = */ "Class", /* 51 = */ "t )", /* 52 = */ "n CLOSE", /* 53 = */ "CLOSE", /* 54 = */ "t \\]", /* 55 = */ "n CLOSEB", /* 56 = */ "CLOSEB", /* 57 = */ "t :", /* 58 = */ "n COLON", /* 59 = */ "COLON", /* 60 = */ "t #", /* 61 = */ "n COMMENT", /* 62 = */ "COMMENT", /* 63 = */ "str <control>", /* 64 = */ "n CONTROL", /* 65 = */ "CONTROL", /* 66 = */ "t \173\"\175", /* 67 = */ "n DAPOSTROPH", /* 68 = */ "DAPOSTROPH", /* 69 = */ "str <ddigit>", /* 70 = */ "n DDIGIT", /* 71 = */ "DDIGIT", /* 72 = */ "n Definition", /* 73 = */ "Definition", /* 74 = */ "str <digit>", /* 75 = */ "n DIGIT", /* 76 = */ "DIGIT", /* 77 = */ "t .", /* 78 = */ "n DOT", /* 79 = */ "DOT", /* 80 = */ "n EOF", /* 81 = */ "EOF", /* 82 = */ "cl \173\n\r\175", /* 83 = */ "n EOL", /* 84 = */ "EOL", /* 85 = */ "n Expression", /* 86 = */ "Expression", /* 87 = */ "str END", /* 88 = */ "n Final", /* 89 = */ "Final", |
︙ | ︙ | |||
276 277 278 279 280 281 282 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", | | | | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | /* 109 = */ "Literal", /* 110 = */ "str <lower>", /* 111 = */ "n LOWER", /* 112 = */ "LOWER", /* 113 = */ "t !", /* 114 = */ "n NOT", /* 115 = */ "NOT", /* 116 = */ "t (", /* 117 = */ "n OPEN", /* 118 = */ "OPEN", /* 119 = */ "t \173[\175", /* 120 = */ "n OPENB", /* 121 = */ "OPENB", /* 122 = */ "str PEG", /* 123 = */ "n PEG", /* 124 = */ "PEG", /* 125 = */ "t +", /* 126 = */ "n PLUS", |
︙ | ︙ | |||
303 304 305 306 307 308 309 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", | | | 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | /* 136 = */ "n PUNCT", /* 137 = */ "PUNCT", /* 138 = */ "t ?", /* 139 = */ "n QUESTION", /* 140 = */ "QUESTION", /* 141 = */ "n Range", /* 142 = */ "Range", /* 143 = */ "t \173;\175", /* 144 = */ "n SEMICOLON", /* 145 = */ "SEMICOLON", /* 146 = */ "n Sequence", /* 147 = */ "Sequence", /* 148 = */ "t /", /* 149 = */ "n SLASH", /* 150 = */ "SLASH", |
︙ | ︙ | |||
616 617 618 619 620 621 622 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (<<state>>); | | | 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 | * '\' * range (0 .. 2) * range (0 .. 7) * range (0 .. 7) */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, "\\", 33); if (rde_param_i_seq_void2void(<<state>>)) return; rde_param_i_next_range (<<state>>, "0", "2", 34); if (rde_param_i_seq_void2void(<<state>>)) return; rde_param_i_next_range (<<state>>, "0", "7", 35); if (rde_param_i_seq_void2void(<<state>>)) return; rde_param_i_next_range (<<state>>, "0", "7", 35); rde_param_i_state_merge_void (<<state>>); |
︙ | ︙ | |||
656 657 658 659 660 661 662 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (<<state>>); | | | 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 | * '\' * range (0 .. 7) * ? * range (0 .. 7) */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, "\\", 33); if (rde_param_i_seq_void2void(<<state>>)) return; rde_param_i_next_range (<<state>>, "0", "7", 35); if (rde_param_i_seq_void2void(<<state>>)) return; <<self>> <<ns>>optional_50 (<<state>>); rde_param_i_state_merge_void (<<state>>); return; } |
︙ | ︙ | |||
702 703 704 705 706 707 708 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (<<state>>); | | | | 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 | /* * x * '\' * [nrt'\"[]\] */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, "\\", 33); if (rde_param_i_seq_void2void(<<state>>)) return; rde_param_i_next_class (<<state>>, "nrt'\"[]\\", 40); rde_param_i_state_merge_void (<<state>>); return; } /* * leaf Symbol 'CharUnescaped' */ |
︙ | ︙ | |||
750 751 752 753 754 755 756 | <<attributes>> void <<ns>>notahead_61 (<<STATE>> <<state>>) { <<prelude>> /* * ! * '\' */ rde_param_i_loc_push (<<state>>); | | | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 | <<attributes>> void <<ns>>notahead_61 (<<STATE>> <<state>>) { <<prelude>> /* * ! * '\' */ rde_param_i_loc_push (<<state>>); rde_param_i_next_char (<<state>>, "\\", 33); rde_param_i_notahead_exit (<<state>>); return; } /* * leaf Symbol 'CharUnicode' */ |
︙ | ︙ | |||
796 797 798 799 800 801 802 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (<<state>>); | | | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 | * x * <xdigit> * ? * <xdigit> */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_str (<<state>>, "\\u", 46); if (rde_param_i_seq_void2void(<<state>>)) return; rde_param_i_next_xdigit (<<state>>, 13); if (rde_param_i_seq_void2void(<<state>>)) return; <<self>> <<ns>>optional_80 (<<state>>); rde_param_i_state_merge_void (<<state>>); return; } |
︙ | ︙ | |||
1003 1004 1005 1006 1007 1008 1009 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (<<state>>); | | | | 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | /* * x * '\)' * (WHITESPACE) */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, ")", 51); if (rde_param_i_seq_void2void(<<state>>)) return; <<self>> <<ns>>sym_WHITESPACE (<<state>>); rde_param_i_state_merge_void (<<state>>); return; } /* * void Symbol 'CLOSEB' */ <<attributes>> void <<ns>>sym_CLOSEB (<<STATE>> <<state>>) { <<prelude>> /* * ']' */ if (rde_param_i_symbol_void_start (<<state>>, 56)) return ; rde_param_i_next_char (<<state>>, "]", 54); rde_param_i_symbol_done_void (<<state>>, 56, 55); return; } /* * void Symbol 'COLON' */ |
︙ | ︙ | |||
1188 1189 1190 1191 1192 1193 1194 | <<attributes>> void <<ns>>sym_DAPOSTROPH (<<STATE>> <<state>>) { <<prelude>> /* * '\"' */ if (rde_param_i_symbol_void_start (<<state>>, 68)) return ; | | | 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 | <<attributes>> void <<ns>>sym_DAPOSTROPH (<<STATE>> <<state>>) { <<prelude>> /* * '\"' */ if (rde_param_i_symbol_void_start (<<state>>, 68)) return ; rde_param_i_next_char (<<state>>, "\"", 66); rde_param_i_symbol_done_void (<<state>>, 68, 67); return; } /* * leaf Symbol 'DDIGIT' */ |
︙ | ︙ | |||
2104 2105 2106 2107 2108 2109 2110 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (<<state>>); | | | | 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 | /* * x * '\(' * (WHITESPACE) */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, "(", 116); if (rde_param_i_seq_void2void(<<state>>)) return; <<self>> <<ns>>sym_WHITESPACE (<<state>>); rde_param_i_state_merge_void (<<state>>); return; } /* * void Symbol 'OPENB' */ <<attributes>> void <<ns>>sym_OPENB (<<STATE>> <<state>>) { <<prelude>> /* * '[' */ if (rde_param_i_symbol_void_start (<<state>>, 121)) return ; rde_param_i_next_char (<<state>>, "[", 119); rde_param_i_symbol_done_void (<<state>>, 121, 120); return; } /* * void Symbol 'PEG' */ |
︙ | ︙ | |||
2582 2583 2584 2585 2586 2587 2588 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (<<state>>); | | | 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 | /* * x * ';' * (WHITESPACE) */ rde_param_i_state_push_void (<<state>>); rde_param_i_next_char (<<state>>, ";", 143); if (rde_param_i_seq_void2void(<<state>>)) return; <<self>> <<ns>>sym_WHITESPACE (<<state>>); rde_param_i_state_merge_void (<<state>>); return; } /* |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_param-compact/3_peg_itself.
︙ | ︙ | |||
746 747 748 749 750 751 752 | failed_93: loc_pop_rewind return char_85: # '\' | | | | 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 | failed_93: loc_pop_rewind return char_85: # '\' input_next "t \" ok! test_char "\" return range_87: # range (0 .. 2) input_next ".. 0 2" ok! test_range "0" "2" |
︙ | ︙ | |||
1018 1019 1020 1021 1022 1023 1024 | input_next "t t" ok! test_char "t" return char_114: # '\"' | | | | 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 | input_next "t t" ok! test_char "t" return char_114: # '\"' input_next "t "" ok! test_char """ return char_116: # '[' input_next "t [" ok! test_char "[" |
︙ | ︙ | |||
2325 2326 2327 2328 2329 2330 2331 | oknoast_290: loc_pop_discard return char_286: # '\n' | | | | | | 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 | oknoast_290: loc_pop_discard return char_286: # '\n' input_next "t <LF>" ok! test_char "<LF>" return char_288: # '\r' input_next "t <CR>" ok! test_char "<CR>" return # # value Symbol 'Expression' # sym_Expression: # x |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_param-inlined/3_peg_itself.
︙ | ︙ | |||
638 639 640 641 642 643 644 | # range (0 .. 7) loc_push error_clear error_push | | | | 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 | # range (0 .. 7) loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_76 error_push input_next ".. 0 2" ok! test_range "0" "2" |
︙ | ︙ | |||
710 711 712 713 714 715 716 | # range (0 .. 7) loc_push error_clear error_push | | | | 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 | # range (0 .. 7) loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_86 error_push input_next ".. 0 7" ok! test_range "0" "7" |
︙ | ︙ | |||
802 803 804 805 806 807 808 | # '\' loc_push error_clear error_push | | | | 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 | # '\' loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_103 error_push call choice_100 |
︙ | ︙ | |||
877 878 879 880 881 882 883 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push | | | | 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push input_next "t "" ok! test_char """ error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push |
︙ | ︙ | |||
907 908 909 910 911 912 913 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push | | | | 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push input_next "t \" ok! test_char "\" error_pop_merge ok! jump oknoast_99 loc_pop_rewind status_fail return |
︙ | ︙ | |||
981 982 983 984 985 986 987 | notahead_108: # ! # '\' loc_push | | | | 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 | notahead_108: # ! # '\' loc_push input_next "t \" ok! test_char "\" loc_pop_rewind status_negate return # # leaf Symbol 'CharUnicode' # |
︙ | ︙ | |||
1040 1041 1042 1043 1044 1045 1046 | # <xdigit> loc_push error_clear error_push | | | | 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 | # <xdigit> loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_135 error_push input_next "t u" ok! test_char "u" |
︙ | ︙ | |||
1722 1723 1724 1725 1726 1727 1728 | sym_DAPOSTROPH: # '\"' symbol_restore DAPOSTROPH found! return loc_push | | | | 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 | sym_DAPOSTROPH: # '\"' symbol_restore DAPOSTROPH found! return loc_push input_next "t "" ok! test_char """ value_clear symbol_save DAPOSTROPH error_nonterminal DAPOSTROPH loc_pop_discard return # |
︙ | ︙ | |||
2166 2167 2168 2169 2170 2171 2172 | # '\r' error_clear loc_push error_push | | | | | | 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 | # '\r' error_clear loc_push error_push input_next "t <LF>" ok! test_char "<LF>" error_pop_merge ok! jump oknoast_258 loc_pop_rewind loc_push error_push input_next "t <CR>" ok! test_char "<CR>" error_pop_merge ok! jump oknoast_258 loc_pop_rewind status_fail return |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_param-unopt/3_peg_itself.
︙ | ︙ | |||
809 810 811 812 813 814 815 | failed_103: loc_pop_rewind return char_94: # '\' | | | | 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 | failed_103: loc_pop_rewind return char_94: # '\' input_next "t \" ok! test_char "\" return range_96: # range (0 .. 2) input_next ".. 0 2" ok! test_range "0" "2" |
︙ | ︙ | |||
899 900 901 902 903 904 905 | failed_116: loc_pop_rewind return char_107: # '\' | | | | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 | failed_116: loc_pop_rewind return char_107: # '\' input_next "t \" ok! test_char "\" return range_109: # range (0 .. 7) input_next ".. 0 7" ok! test_range "0" "7" |
︙ | ︙ | |||
1003 1004 1005 1006 1007 1008 1009 | failed_142: loc_pop_rewind return char_120: # '\' | | | | 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 | failed_142: loc_pop_rewind return char_120: # '\' input_next "t \" ok! test_char "\" return choice_139: # / # 'n' # 'r' # 't' |
︙ | ︙ | |||
1130 1131 1132 1133 1134 1135 1136 | input_next "t '" ok! test_char "'" return char_130: # '\"' | | | | | | 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 | input_next "t '" ok! test_char "'" return char_130: # '\"' input_next "t "" ok! test_char """ return char_132: # '[' input_next "t [" ok! test_char "[" return char_134: # ']' input_next "t ]" ok! test_char "]" return char_136: # '\' input_next "t \" ok! test_char "\" return # # leaf Symbol 'CharUnescaped' # sym_CharUnescaped: # x |
︙ | ︙ | |||
1224 1225 1226 1227 1228 1229 1230 | loc_pop_rewind status_negate return char_146: # '\' | | | | 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 | loc_pop_rewind status_negate return char_146: # '\' input_next "t \" ok! test_char "\" return # # leaf Symbol 'CharUnicode' # sym_CharUnicode: # x |
︙ | ︙ | |||
1313 1314 1315 1316 1317 1318 1319 | failed_181: loc_pop_rewind return char_156: # '\' | | | | 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 | failed_181: loc_pop_rewind return char_156: # '\' input_next "t \" ok! test_char "\" return char_158: # 'u' input_next "t u" ok! test_char "u" |
︙ | ︙ | |||
2087 2088 2089 2090 2091 2092 2093 | error_nonterminal DAPOSTROPH loc_pop_discard return char_263: # '\"' | | | | 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 | error_nonterminal DAPOSTROPH loc_pop_discard return char_263: # '\"' input_next "t "" ok! test_char """ return # # leaf Symbol 'DDIGIT' # sym_DDIGIT: # x |
︙ | ︙ | |||
2647 2648 2649 2650 2651 2652 2653 | oknoast_336: loc_pop_discard return char_332: # '\n' | | | | | | 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 | oknoast_336: loc_pop_discard return char_332: # '\n' input_next "t <LF>" ok! test_char "<LF>" return char_334: # '\r' input_next "t <CR>" ok! test_char "<CR>" return # # value Symbol 'Expression' # sym_Expression: # x |
︙ | ︙ |
Changes to modules/pt/tests/data/ok/peg_param/3_peg_itself.
︙ | ︙ | |||
638 639 640 641 642 643 644 | # range (0 .. 7) loc_push error_clear error_push | | | | 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 | # range (0 .. 7) loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_76 error_push input_next ".. 0 2" ok! test_range "0" "2" |
︙ | ︙ | |||
710 711 712 713 714 715 716 | # range (0 .. 7) loc_push error_clear error_push | | | | 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 | # range (0 .. 7) loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_86 error_push input_next ".. 0 7" ok! test_range "0" "7" |
︙ | ︙ | |||
802 803 804 805 806 807 808 | # '\' loc_push error_clear error_push | | | | 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 | # '\' loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_103 error_push call choice_100 |
︙ | ︙ | |||
877 878 879 880 881 882 883 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push | | | | 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push input_next "t "" ok! test_char """ error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push |
︙ | ︙ | |||
907 908 909 910 911 912 913 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push | | | | 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 | error_pop_merge ok! jump oknoast_99 loc_pop_rewind loc_push error_push input_next "t \" ok! test_char "\" error_pop_merge ok! jump oknoast_99 loc_pop_rewind status_fail return |
︙ | ︙ | |||
981 982 983 984 985 986 987 | notahead_108: # ! # '\' loc_push | | | | 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 | notahead_108: # ! # '\' loc_push input_next "t \" ok! test_char "\" loc_pop_rewind status_negate return # # leaf Symbol 'CharUnicode' # |
︙ | ︙ | |||
1040 1041 1042 1043 1044 1045 1046 | # <xdigit> loc_push error_clear error_push | | | | 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 | # <xdigit> loc_push error_clear error_push input_next "t \" ok! test_char "\" error_pop_merge fail! jump failed_135 error_push input_next "t u" ok! test_char "u" |
︙ | ︙ | |||
1722 1723 1724 1725 1726 1727 1728 | sym_DAPOSTROPH: # '\"' symbol_restore DAPOSTROPH found! return loc_push | | | | 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 | sym_DAPOSTROPH: # '\"' symbol_restore DAPOSTROPH found! return loc_push input_next "t "" ok! test_char """ value_clear symbol_save DAPOSTROPH error_nonterminal DAPOSTROPH loc_pop_discard return # |
︙ | ︙ | |||
2166 2167 2168 2169 2170 2171 2172 | # '\r' error_clear loc_push error_push | | | | | | 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 | # '\r' error_clear loc_push error_push input_next "t <LF>" ok! test_char "<LF>" error_pop_merge ok! jump oknoast_258 loc_pop_rewind loc_push error_push input_next "t <CR>" ok! test_char "<CR>" error_pop_merge ok! jump oknoast_258 loc_pop_rewind status_fail return |
︙ | ︙ |