fix grammar lex

limuy2022 · Feb 5, 2024 · 3aa9bd5 · 3aa9bd5
1 parent d0e64d2
commit 3aa9bd5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/rust/derive/src/def_module.rs b/rust/derive/src/def_module.rs
@@ -31,10 +31,8 @@ pub fn lex_arrow(
                         left_name = TokenStream::new();
                         right_name = TokenStream::new();
                         control_which_put = false;
-                    } else if x == "]" {
-                        left_push.push(syn::parse(left_name).expect("left push break"));
-                        right_push.push(syn::parse(right_name).expect("right push break"));
-                        break;
+                    } else {
+                        panic!("{}", errormsg);
                     }
                 } else {
                     if !control_which_put {
@@ -44,6 +42,8 @@ pub fn lex_arrow(
                     }
                 }
             }
+            left_push.push(syn::parse(left_name).expect("left push break"));
+            right_push.push(syn::parse(right_name).expect("right push break"));
         }
         _ => {
             panic!("{}", errormsg);
@@ -147,15 +147,19 @@ pub fn def_impl(content: TokenStream) -> TokenStream {
             use std::collections::hash_map::HashMap;
             let mut functions = HashMap::new();
             let mut classes = HashMap::new();
+            let mut submodules = HashMap::new();
             #(
                 functions.insert(stringify!(#right_func).to_string(), #left_func());
             )*
             #(
                 classes.insert(stringify!(#right_class).to_string(), #left_class::export_info());
             )*
+            #(
+                submodules.insert(stringify!(#submodules).to_string(), #submodules::init());
+            )*
             Stdlib::new(
                 stringify!(#module_ident),
-                HashMap::new(),
+                submodules,
                 functions,
                 classes
             )

diff --git a/rust/src/compiler/ast.rs b/rust/src/compiler/ast.rs
@@ -638,7 +638,17 @@ mod tests {
             t.staticdata.inst,
             vec![
                 Inst::new(Opcode::LoadString, 0),
-                Inst::new(Opcode::CallNative, 0),
+                Inst::new(
+                    Opcode::CallNative,
+                    STDLIB_ROOT
+                        .sub_modules
+                        .get("prelude")
+                        .unwrap()
+                        .functions
+                        .get("print")
+                        .unwrap()
+                        .buildin_id
+                ),
             ]
         )
     }

diff --git a/rust/src/tvm/stdlib/prelude.rs b/rust/src/tvm/stdlib/prelude.rs
@@ -1,3 +1,4 @@
+use super::super::types::*;
 use crate::base::stdlib::*;
 use crate::{base::error::*, tvm::DynaData};
 use derive::{def_module, trc_function};
@@ -13,5 +14,8 @@ pub fn println(obj: any) -> void {
 }
 
 def_module!(module_name = prelude, functions = [print => print, println => print], classes = [
-    Trcint => int
+    TrcInt => int,
+    TrcStr => str,
+    TrcBool => bool,
+    TrcFloat => float
 ]);
diff --git a/rust/src/tvm/types.rs b/rust/src/tvm/types.rs
@@ -10,6 +10,11 @@ pub mod trcfloat;
 pub mod trcint;
 pub mod trcstr;
 
+pub use trcbool::TrcBool;
+pub use trcfloat::TrcFloat;
+pub use trcint::TrcInt;
+pub use trcstr::TrcStr;
+
 /// help to generate the same error reporter functions
 macro_rules! batch_unsupported_operators {
     ($($traie_name:ident => $oper_name:expr),*) => {