Redefine severity (#119)

See table in src/value/README.md for details.

src/value/README.md

@@ -30,3 +30,11 @@ This is how Tokay builtin values are converted during binary operations.
 | **str**   |   str    |   str    |   str    |   str   |   str     |   str    |   str   |   dict   |   list
 | **dict**  |   dict   |   dict   |   dict   |   dict  |   dict    |   dict   |   dict  |   dict   |   list
 | **list**  |   list   |   list   |   list   |   list  |   list    |   list   |   list  |   list   |   list
+
+# Token severity
+
+| Severity | Used by                                                                 |
+| -------- | ----------------------------------------------------------------------- |
+|        0 | `_`, `__`, `Touch`                                                      |
+|        5 | Any token (`Char`, `Match`, `Int`, `Float`, `Number`), parselet default |
+|       10 | Any explicitly pushed value                                             |

src/value/list.rs

@@ -161,7 +161,7 @@ impl List {
     tokay_method!("list_iadd : @list, append", {
         // Don't append void
         if append.is_void() {
-            return Ok(list)
+            return Ok(list);
         }
 
         // In case list is not a list, make it a list.
@@ -199,7 +199,7 @@ impl List {
     tokay_method!("list_add : @list, append", {
         // Don't append void
         if append.is_void() {
-            return Ok(list)
+            return Ok(list);
         }
 
         // In case list is not a list, make it a list.
@@ -227,7 +227,7 @@ impl List {
     tokay_method!("list_push : @list, item, index=void", {
         // Don't push void
         if item.is_void() {
-            return Ok(list)
+            return Ok(list);
         }
 
         // In case list is not a list, make it a list.

src/value/token.rs

@@ -158,7 +158,7 @@ impl Token {
                         range,
                         None,
                         if matches!(self, Token::Touch(_)) {
-                            1
+                            0
                         } else {
                             5
                         },

src/vm/context.rs

@@ -311,7 +311,7 @@ impl<'program, 'reader, 'thread, 'parselet> Context<'program, 'reader, 'thread,
 
         let mut list = List::new(); // List collector
         let mut dict = Dict::new(); // Dict collector
-        let mut max = 0; // Maximum severity
+        let mut max = self.parselet.severity; // Require at least parselet severity level
         let mut idx = 0; // Keep the order for dicts
 
         // Collect any significant captures and values

tests/parselet_leftrec.tok

@@ -1,13 +1,13 @@
 # direct1
 D1: @{
-    D1? ''a''
+    D1? Char<a>
 }
 'D1' print(D1)
 
 # direct2
 D2: @{
-    D2 'b'
-    'a'
+    D2 Char<b>
+    Char<a>
 }
 'D2' print(D2)
 

tests/token_modifiers.tok

@@ -24,7 +24,6 @@ Int
 #abcbcd ad
 #Hello,   World,  Beta,  Test
 #---
-#(("a", "b"), ("a", "b"), ("a", "b"))
 #("b", "b", "b")
 #("b", ("b", "b", "b"), "b")
 #(("a", "b"), ("a", ("b", "b", "b")), ("b", "b"), ("a", "b"), "b")