start playing with macros for easier traces

Author: tjdevries

Cargo.lock

@@ -20,4 +20,5 @@ members = [
     "crates/vim9-lexer",
     "crates/vim9-parser",
     "crates/vim9-gen",
+    "crates/macros",
 ]

Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "macros"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0"
+quote = "1.0"

crates/macros/Cargo.toml

@@ -0,0 +1,66 @@
+extern crate proc_macro;
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{parse_macro_input, visit_mut::VisitMut, ImplItem};
+
+struct ReplaceQuestions {
+    name: syn::Type,
+    count: usize,
+}
+
+impl VisitMut for ReplaceQuestions {
+    fn visit_expr_mut(&mut self, i: &mut syn::Expr) {
+        match i {
+            syn::Expr::Try(try_expr) => {
+                syn::visit_mut::visit_expr_try_mut(self, try_expr);
+
+                // let name = syn::LitStr::new(&self.name, self.span);
+                let e = &try_expr.expr;
+                // *i = syn::parse_quote! {
+                //     match #e {
+                //         ::core::result::Result::Ok(v) => v,
+                //         ::core::result::Result::Err(e) => {
+                //             panic!(#name);
+                //             // return Err(e.context("oh no"));
+                //         }
+                //     }
+                // };
+
+                self.count += 1;
+                let name = &self.name;
+                // let count = &self.count;
+
+                *i = syn::parse_quote! {
+                    #e.expect(&format!("{}.{}", stringify!(#name), stringify!(#e)))
+                }
+            }
+            _ => syn::visit_mut::visit_expr_mut(self, i),
+        }
+    }
+}
+
+#[proc_macro_attribute]
+pub fn parse_context(_attr: TokenStream, tokens: TokenStream) -> TokenStream {
+    let mut input = parse_macro_input!(tokens as syn::ItemImpl);
+    for mut item in input.items.iter_mut() {
+        match &item {
+            ImplItem::Const(_) => todo!(),
+            ImplItem::Method(_) => {
+                let mut replacer = ReplaceQuestions {
+                    name: *input.self_ty.clone(),
+                    count: 0,
+                };
+
+                replacer.visit_impl_item_mut(&mut item);
+            }
+            ImplItem::Type(_) => todo!(),
+            ImplItem::Macro(_) => todo!(),
+            ImplItem::Verbatim(_) => todo!(),
+            _ => todo!(),
+        }
+    }
+
+    TokenStream::from(quote! {
+        #input
+    })
+}

crates/macros/src/lib.rs

@@ -7,14 +7,15 @@ use parser::{
     self, new_parser, ArrayLiteral, AssignStatement, AugroupCommand,
     AutocmdCommand, Body, BreakCommand, CallCommand, CallExpression,
     ContinueCommand, DeclCommand, DefCommand, DeferCommand, DictAccess,
-    DictLiteral, EchoCommand, ExecuteCommand, ElseCommand, ElseIfCommand, ExCommand,
-    Expandable, ExportCommand, Expression, ForCommand, GroupedExpression,
-    Heredoc, Identifier, IfCommand, ImportCommand, IndexExpression, IndexType,
-    InfixExpression, InnerType, Lambda, Literal, MethodCall, MutationStatement,
-    PrefixExpression, RawIdentifier, Register, ReturnCommand, ScopedIdentifier,
-    SharedCommand, Signature, StatementCommand, Ternary, TryCommand, Type,
-    UnpackIdentifier, UserCommand, VarCommand, Vim9ScriptCommand, VimBoolean,
-    VimKey, VimNumber, VimOption, VimScope, VimString, WhileCommand,
+    DictLiteral, EchoCommand, ElseCommand, ElseIfCommand, ExCommand,
+    ExecuteCommand, Expandable, ExportCommand, Expression, ForCommand,
+    GroupedExpression, Heredoc, Identifier, IfCommand, ImportCommand,
+    IndexExpression, IndexType, InfixExpression, InnerType, Lambda, Literal,
+    MethodCall, MutationStatement, PrefixExpression, RawIdentifier, Register,
+    ReturnCommand, ScopedIdentifier, SharedCommand, Signature,
+    StatementCommand, Ternary, TryCommand, Type, UnpackIdentifier, UserCommand,
+    VarCommand, Vim9ScriptCommand, VimBoolean, VimKey, VimNumber, VimOption,
+    VimScope, VimString, WhileCommand,
 };
 
 // this word is missspelled
@@ -1275,7 +1276,7 @@ pub fn eval(program: parser::Program, is_test: bool) -> String {
 
 pub fn generate(contents: &str, is_test: bool) -> String {
     let lexer = Lexer::new(contents);
-    let mut parser = new_parser(lexer);
+    let parser = new_parser(&lexer);
     let program = parser.parse_program();
 
     let result = eval(program, is_test);

crates/vim9-gen/src/lib.rs

@@ -6,3 +6,4 @@ def Test_syn()
         ->split("\n")
         ->len())
 enddef
+

crates/vim9-gen/testdata/busted/shared.vim

@@ -10,6 +10,7 @@ describe("filename", function()
   local Test_index_with_prefix = nil
   local Test_string = nil
   -- vim9script
+
   local l = { 1, 2, 3 }
 
   it("Test_can_index", function()

crates/vim9-gen/testdata/output/busted_indexing.lua

@@ -1,11 +1,12 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1005
+assertion_line: 1361
 expression: "generate(contents, false)"
 ---
 local NVIM9 = require("vim9script")
 local __VIM9_MODULE = {}
 -- vim9script
+
 vim.g["my_var"] = NVIM9.ops["Plus"](1, 2)
 print(vim.g["my_var"])
 return __VIM9_MODULE

crates/vim9-gen/testdata/output/vim9_gen__test__assign.snap

@@ -1,12 +1,13 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1251
+assertion_line: 1364
 expression: "generate(contents, false)"
 ---
 local NVIM9 = require("vim9script")
 local __VIM9_MODULE = {}
 local Qf_filter = nil
 -- vim9script
+
 -- # cfilter.vim: Plugin to filter entries from a quickfix/location list
 -- # Last Change: Jun 30, 2022
 -- # Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)

crates/vim9-gen/testdata/output/vim9_gen__test__cfilter.snap

@@ -1,11 +1,12 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1003
+assertion_line: 1359
 expression: "generate(contents, false)"
 ---
 local NVIM9 = require("vim9script")
 local __VIM9_MODULE = {}
 -- vim9script
+
 local x = NVIM9.ops["Plus"](1, 2)
 print(x)
 return __VIM9_MODULE