Merge pull request #548 from ratmice/examples_skip_newlines

Skip newlines from example lexers for nimbleparse.

Author: ltratt

.buildbot.sh

@@ -55,21 +55,21 @@ echo "2 + 3 * 4" | cargo run | grep "Result: 14"
 # Touching these files shouldn't invalidate the cache (via --cfg grmtools_extra_checks)
 touch src/main.rs && CACHE_EXPECTED=y cargo build
 cd $root/lrpar/examples/calc_actions
-echo -n "2 + 3 * 4" | cargo run --package nimbleparse -- src/calc.l src/calc.y -
+echo "2 + 3 * 4" | cargo run --package nimbleparse -- src/calc.l src/calc.y -
 echo "2 + 3 * 4" | cargo run | grep "Result: 14"
 touch src/main.rs && CACHE_EXPECTED=y cargo build
 cd $root/lrpar/examples/calc_ast
-echo -n "2 + 3 * 4" | cargo run --package nimbleparse -- src/calc.l src/calc.y -
+echo "2 + 3 * 4" | cargo run --package nimbleparse -- src/calc.l src/calc.y -
 echo "2 + 3 * 4" | cargo run | grep "Result: 14"
 touch src/main.rs && CACHE_EXPECTED=y cargo build
 cd $root/lrpar/examples/calc_parsetree
-echo -n "2 + 3 * 4" | cargo run --package nimbleparse -- src/calc.l src/calc.y -
+echo "2 + 3 * 4" | cargo run --package nimbleparse -- src/calc.l src/calc.y -
 echo "2 + 3 * 4" | cargo run | grep "Result: 14"
 touch src/main.rs && CACHE_EXPECTED=y cargo build
 cd $root/lrpar/examples/clone_param
-echo -n "1+++" | cargo run --package nimbleparse -- src/param.l src/param.y -
+echo "1+++" | cargo run --package nimbleparse -- src/param.l src/param.y -
 cd $root/lrpar/examples/start_states
-echo -n "/* /* commented out */ */ uncommented text /* */" | cargo run --package nimbleparse -- src/comment.l src/comment.y -
+echo "/* /* commented out */ */ uncommented text /* */" | cargo run --package nimbleparse -- src/comment.l src/comment.y -
 cd $root
 
 RUSTDOCFLAGS="-Dwarnings" cargo doc --no-deps

lrpar/examples/calc_actions/src/calc.l

@@ -4,4 +4,4 @@
 \* "*"
 \( "("
 \) ")"
-[\t ]+ ;
+[\t\n ]+ ;

lrpar/examples/calc_ast/src/calc.l

@@ -4,5 +4,5 @@
 \* "*"
 \( "("
 \) ")"
-[\t ]+ ;
+[\t\n ]+ ;
 . "UNMATCHED"

lrpar/examples/calc_parsetree/src/calc.l

@@ -4,4 +4,4 @@
 \* "*"
 \( "("
 \) ")"
-[\t ]+ ;
+[\t\n ]+ ;

lrpar/examples/start_states/src/comment.l

@@ -3,5 +3,5 @@
 .                       "TEXT"
 <COMMENT,INITIAL>/\*    <+COMMENT>;
 <COMMENT>.              ;
-<COMMENT>\n             ;
+<INITIAL,COMMENT>\n             ;
 <COMMENT>\*/            <-COMMENT>;