Rename and update tests

Author: Yaraslaut

src/shell/AST.h

@@ -169,12 +169,12 @@ struct BuiltinSetStmt final: public Statement
 };
 
 
-struct BuiltinGetStmt final: public Statement
+struct VariableSubstExpr final: public Statement
 {
     std::reference_wrapper<CoreVM::NativeCallback const> callback;
     std::unique_ptr<Expr> name;
 
-    BuiltinGetStmt(std::reference_wrapper<CoreVM::NativeCallback const> callback,
+    VariableSubstExpr(std::reference_wrapper<CoreVM::NativeCallback const> callback,
                    std::unique_ptr<Expr> name):
         callback { callback }, name {std::move( name )}
     {

src/shell/ASTPrinter.cpp

@@ -90,9 +90,9 @@ export class ASTPrinter: public Visitor
         }
     }
 
-    void visit(BuiltinGetStmt const& node) override
+    void visit(VariableSubstExpr const& node) override
     {
-        _result += "get";
+        _result += "substitute";
 
         if (node.name)
         {

src/shell/IRGenerator.cpp

@@ -104,7 +104,7 @@ export class IRGenerator final: public CoreVM::IRBuilder, public ast::Visitor
         _result = createCallFunction(getBuiltinFunction(node.callback.get()), callArguments, "set");
     }
 
-    void visit(ast::BuiltinGetStmt const& node) override
+    void visit(ast::VariableSubstExpr const& node) override
     {
         auto callArguments = std::vector<CoreVM::Value*> {};
         if (node.name )

src/shell/Lexer_test.cpp

@@ -5,7 +5,7 @@ import Lexer;
 
 TEST_CASE("Lexer.basic")
 {
-    auto lexer = endo::Lexer(std::make_unique<endo::StringSource>("echo hello world $PATH"));
+    auto lexer = endo::Lexer(std::make_unique<endo::StringSource>("echo hello world $PATH ${PATH}"));
     CHECK(lexer.currentToken() == endo::Token::Identifier);
     CHECK(lexer.currentLiteral() == "echo");
 
@@ -21,6 +21,10 @@ TEST_CASE("Lexer.basic")
     CHECK(lexer.currentToken() == endo::Token::DollarName);
     CHECK(lexer.currentLiteral() == "PATH");
 
+    lexer.nextToken();
+    CHECK(lexer.currentToken() == endo::Token::DollarName);
+    CHECK(lexer.currentLiteral() == "PATH");
+
     lexer.nextToken();
     CHECK(lexer.currentToken() == endo::Token::EndOfInput);
 }

src/shell/Parser.cpp

@@ -99,7 +99,7 @@ export class Parser
             case Token::DollarName: {
                 auto name = std::make_unique<ast::LiteralExpr>(_lexer.currentLiteral());
                _lexer.nextToken();
-                return std::make_unique<ast::BuiltinGetStmt>(*_runtime.find("get(S)S"), std::move(name));
+                return std::make_unique<ast::VariableSubstExpr>(*_runtime.find("substitute(S)S"), std::move(name));
             }
             case Token::String:
             case Token::Identifier:

src/shell/Shell.cpp

@@ -340,10 +340,10 @@ export class Shell final: public CoreVM::Runtime
         .returnType(CoreVM::LiteralType::Boolean)
         .bind(&Shell::builtinSet, this);
 
-    registerFunction("get")
+    registerFunction("substitute")
         .param<std::string>("name")
         .returnType(CoreVM::LiteralType::String)
-        .bind(&Shell::builtinGet, this);
+        .bind(&Shell::builtinVariableSubst, this);
 
 
     registerFunction("callproc")
@@ -549,7 +549,7 @@ export class Shell final: public CoreVM::Runtime
         _env.set(context.getString(1), context.getString(2));
         context.setResult(true);
     }
-    void builtinGet(CoreVM::Params& context)
+    void builtinVariableSubst(CoreVM::Params& context)
     {
         auto res = _env.get(context.getString(1));
         if(res.has_value())

src/shell/Shell_test.cpp

@@ -92,7 +92,6 @@ TEST_CASE("shell.builtin.get_variable_inside_curl_brackets")
     TestShell shell;
     shell("set BRU hello");
     CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
-    fmt::print("=======================================\n");
     shell("${BRU}");
 }
 

src/shell/Visitor.h

@@ -6,7 +6,7 @@ namespace endo::ast
 
 struct BuiltinChDirStmt;
 struct BuiltinSetStmt;
-struct BuiltinGetStmt;
+struct VariableSubstExpr;
 struct BuiltinExportStmt;
 struct BuiltinFalseStmt;
 struct BuiltinExitStmt;
@@ -49,7 +49,7 @@ struct Visitor
     virtual void visit(BuiltinReadStmt const&) = 0;
     virtual void visit(BuiltinChDirStmt const&) = 0;
     virtual void visit(BuiltinSetStmt const&) = 0;
-    virtual void visit(BuiltinGetStmt const&) = 0;
+    virtual void visit(VariableSubstExpr const&) = 0;
 
     // epxressions
     virtual void visit(LiteralExpr const&) = 0;