Merge branch 'fix-termination' into 'master'

Fix termination of quoted strings containing "<<"

Closes #842

See merge request redox-os/ion!895

CONTRIBUTING.md

@@ -38,7 +38,7 @@ Before submitting a PR, ensure that you've run your tests locally and that they
 pass. This can be done by running the following two commands:
 
 ```sh
-cargo +nightly test --lib && bash examples/run_examples/sh
+cargo +nightly test --lib && bash examples/run_examples.sh
 ```
 
 ## Format your code

examples/strings.ion

@@ -6,3 +6,15 @@ echo "\$hello"
 echo "\\"
 echo "\n"
 echo "\""
+echo "<"
+echo '<'
+echo "<<"
+echo '<<'
+echo "<<<"
+echo '<<<'
+echo ">"
+echo '>'
+echo ">>"
+echo '>>'
+echo ">>>"
+echo '>>>'

examples/strings.out

@@ -6,3 +6,15 @@ $hello
 \
 \n
 "
+<
+<
+<<
+<<
+<<<
+<<<
+>
+>
+>>
+>>
+>>>
+>>>

src/lib/parser/quotes.rs

@@ -64,7 +64,7 @@ impl Terminator {
                             b'"' if !self.flags.intersects(Flags::SQUOTE) => {
                                 self.flags ^= Flags::DQUOTE
                             }
-                            b'<' if !self.flags.contains(Flags::SQUOTE | Flags::DQUOTE) => {
+                            b'<' if !self.flags.intersects(Flags::SQUOTE | Flags::DQUOTE) => {
                                 let as_bytes = self.buffer.as_bytes();
                                 if Some(&b'<') == as_bytes.get(self.read) {
                                     self.read += 1;