Merge contents of current branch 'generic-parselets'

This is NOT the generic-parselets feature yet, but it is a milestone in rewriting most parts of the compiler and its intermediate language, with generic parselets projected already.

Cargo.toml

@@ -32,13 +32,14 @@ tokay = "0.4"
 glob = "0.3"
 
 [dependencies]
-charclass = "0.1"
+charclass = "0.2"  # use crates.io-version
+#charclass = { version = "0.2", path = "../charclass" }  # use local version
 clap = { version = "3", features = ["derive"] }
 indexmap = "1.8"
 num = "0.4"
 num-bigint = "0.4"
 rustyline = "8.2"
-#tokay-macros = "0.2"
-tokay-macros = { version = "0.2", path = "macros" }
-num-parse = "0.1"
-#num-parse = { version = "0.1", path = "../num-parse" }
+#tokay-macros = "0.2"  # use crates.io-version
+tokay-macros = { version = "0.2", path = "macros" }  # use local version
+num-parse = "0.1"  # use crates.io-version
+#num-parse = { version = "0.1", path = "../num-parse" }  # use local version

examples/tokay.tok

@@ -189,20 +189,20 @@ TokenLiteral : @{
     '[' Ccl ']'  ast("value_token_ccl")
 }
 
-TokenCall : @{
+TokenAtom : @{
     TokenLiteral
     T_Consumable '(' _ ___ CallParameters? ___ expect ')'  ast("call")
-    T_Consumable  ast("call")
+    T_Consumable
     Parselet
     InlineSequences
     Block
 }
 
 Token1 : @{  # todo: Token1 can be renamed back to Token again when #31 is fixed and Self is used.
-    TokenCall '+'  ast("op_mod_pos")
-    TokenCall '*'  ast("op_mod_kle")
-    TokenCall '?'  ast("op_mod_opt")
-    TokenCall
+    TokenAtom '+'  ast("op_mod_pos")
+    TokenAtom '*'  ast("op_mod_kle")
+    TokenAtom '?'  ast("op_mod_opt")
+    TokenAtom
     'peek' _SeparatedIdentifier expect Token1  ast("op_mod_peek")
     'not' _SeparatedIdentifier expect Token1  ast("op_mod_not")
     'expect' _SeparatedIdentifier expect Token1  ast("op_mod_expect")
@@ -283,10 +283,7 @@ LogicalOr : @{
 }
 
 Expression : @{
-    Lvalue _ '=' not {
-        '>'
-        '='
-    } _ expect Expression  ast("assign_hold")
+    Lvalue _ '=' not ('>' | '=') _ expect Expression  ast("assign_hold")
     Lvalue _ '+=' _ expect Expression  ast("assign_add_hold")
     Lvalue _ '-=' _ expect Expression  ast("assign_sub_hold")
     Lvalue _ '*=' _ expect Expression  ast("assign_mul_hold")
@@ -311,10 +308,7 @@ Statement : @{
     'reject' _SeparatedIdentifier  ast("op_reject")
     'repeat' _SeparatedIdentifier Expression?  ast("op_repeat")
     'return' _SeparatedIdentifier Expression?  ast("op_accept")
-    Lvalue _ '=' not {
-        '>'
-        '='
-    } _ expect Expression  ast("assign")
+    Lvalue _ '=' not ('>' | '=') _ expect Expression  ast("assign")
     Lvalue _ '+=' _ expect Expression  ast("assign_add")
     Lvalue _ '-=' _ expect Expression  ast("assign_sub")
     Lvalue _ '*=' _ expect Expression  ast("assign_mul")
@@ -325,8 +319,17 @@ Statement : @{
 # Parselet
 
 Parselet : @{
-    '@' _ Arguments? Block  ast("value_parselet")
-    '@' _ Arguments? Token1  ast("value_parselet")
+    '@' _ Generics? _ Arguments? Expression  ast("value_parselet")
+}
+
+## Parselet: Generics
+
+Generic : @{
+    T_Identifier _ (':' _ expect Atomic)? ast("gen")
+}
+
+Generics : @{
+    '<' _ (Generic (',' _)?)* _ expect '>' _
 }
 
 ## Parselet: Arguments

src/_builtins.rs

@@ -5,7 +5,7 @@ DON'T CHANGE THIS FILE MANUALLY, IT WILL GO AWAY!!!
 */
 use crate::builtin::Builtin;
 
-pub static BUILTINS: [Builtin; 39] = [
+pub static BUILTINS: [Builtin; 40] = [
     Builtin {
         name: "Float",
         func: crate::value::token::tokay_token_float,
@@ -82,6 +82,10 @@ pub static BUILTINS: [Builtin; 39] = [
         name: "list_add",
         func: crate::value::list::List::tokay_method_list_add,
     },
+    Builtin {
+        name: "list_flatten",
+        func: crate::value::list::List::tokay_method_list_flatten,
+    },
     Builtin {
         name: "list_iadd",
         func: crate::value::list::List::tokay_method_list_iadd,

src/builtin.rs

@@ -98,13 +98,13 @@ impl Object for BuiltinRef {
 
 impl PartialEq for BuiltinRef {
     fn eq(&self, other: &Self) -> bool {
-        self.id() == other.id()
+        self.0.name == other.0.name
     }
 }
 
 impl PartialOrd for BuiltinRef {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.id().partial_cmp(&other.id())
+        self.0.name.partial_cmp(&other.0.name)
     }
 }