Renamed `LBPLType` to `Value` and changed example code

diff --git a/README.org b/README.org
index 9d5f07708a7ca5a0db417fc88e816a905fe9744d..72f554d3b9646960d3109c23e0f95f1865a57c5a 100755 (executable)
--- a/README.org
+++ b/README.org
@@ -11,22 +11,30 @@ make
 * Example script
 #+begin_src
 fn fib(n) {
-    if (n < 2) {
-        return n;
-    }
-    return fib(n-1)+fib(n-2);
+   return fibIter(n, 0, 1);
+}
+
+fn fibIter(n, curr, next) {
+   if (n == 0) {
+      return curr;
+   } else if (n == 1) {
+     return next;
+   } else {
+     return fibIter(n - 1, next, curr + next);
+   }
 }
 
 class Prova {
     init(n) {
         this.n = n;
         this.start = clock();
-        fib(n);
+        this.fib_n = fib(n);
         this.end = clock();
     }
 
     runtime() {
-        println("fib("+ this.n +") runtime: " + (this.end - this.start));
+        println("fib("+ this.n +") = "+ this.fib_n + " runtime: " +
+                (this.end - this.start));
     }
 }
 

diff --git a/lib/LBPLCallable.h b/lib/LBPLCallable.h
index b858e696f72c1a4c880eb017d6571c716c1f7051..eb2b0560e0fc6cca38572cec559b4fd7f21c9eca 100644 (file)
--- a/lib/LBPLCallable.h
+++ b/lib/LBPLCallable.h
@@ -9,7 +9,7 @@ class Interpreter;
 class LBPLCallable {
 public:
   virtual int arity() = 0;
-  virtual LBPLType call(Interpreter*, std::vector<LBPLType>&) = 0;
+  virtual Value call(Interpreter*, std::vector<Value>&) = 0;
 };
 
 #endif

diff --git a/lib/LBPLClass.h b/lib/LBPLClass.h
index 58ed0ac9a3d931bcd5c8d98e426dba6a4a7d65ba..752e7ebb7f8411325381a37d5a0a57c81793268b 100644 (file)
--- a/lib/LBPLClass.h
+++ b/lib/LBPLClass.h
@@ -23,7 +23,7 @@ public:
   LBPLFunc *findMethod(const std::string &);
 
   int arity() override;
-  LBPLType call(Interpreter *, std::vector<LBPLType> &) override;
+  Value call(Interpreter *, std::vector<Value> &) override;
 };
 
 #endif

diff --git a/lib/LBPLFunction.h b/lib/LBPLFunction.h
index de661e10615a85732c776c68f924f0ef0471394b..c33d905b43def6e639d40d49bf8d403d162371e3 100644 (file)
--- a/lib/LBPLFunction.h
+++ b/lib/LBPLFunction.h
@@ -24,7 +24,7 @@ public:
   void bind(std::shared_ptr<LBPLInstance> &instance);
 
   int arity() override;
-  LBPLType call(Interpreter *, std::vector<LBPLType> &) override;
+  Value call(Interpreter *, std::vector<Value> &) override;
 };
 
 #endif

diff --git a/lib/LBPLInstance.h b/lib/LBPLInstance.h
index a4631420eee9b0cd4704a6d98ebc5f2788a04f3c..d895701ba96242824fa8737e0157b73de07f19b2 100644 (file)
--- a/lib/LBPLInstance.h
+++ b/lib/LBPLInstance.h
@@ -10,15 +10,15 @@
 class LBPLInstance {
 private:
   LBPLClass *lbplClass;
-  std::map<std::string, LBPLType> fields;
+  std::map<std::string, Value> fields;
 
 public:
   LBPLInstance(LBPLClass *lbplClass) : lbplClass(lbplClass), fields() {}
   LBPLInstance(LBPLInstance *other)
       : lbplClass(other->lbplClass), fields(other->fields) {}
 
-  LBPLType get(const Token *name);
-  void set(const Token *name, LBPLType &value);
+  Value get(const Token *name);
+  void set(const Token *name, Value &value);
 };
 
 #endif

diff --git a/lib/LBPLTypes.h b/lib/LBPLTypes.h
index d37fa91aa542a7ac40ec77edb7f337f877588f20..a131d316557339e7cd72f9db35ccc2fb6d38a5ca 100644 (file)
--- a/lib/LBPLTypes.h
+++ b/lib/LBPLTypes.h
@@ -9,7 +9,7 @@ class LBPLInstance;
 class LBPLCallable;
 class LBPLClass;
 
-using LBPLType =
+using Value =
     std::variant<std::string, int, double, bool, char, std::nullptr_t,
                  std::shared_ptr<LBPLClass>, std::shared_ptr<LBPLInstance>,
                  std::shared_ptr<LBPLCallable>>;

diff --git a/lib/ast_printer.h b/lib/ast_printer.h
index 01be7d351edacfcb52e3a6b97b6c4883de83b65f..3b8a4b5a3671c672e20297c4bdc62624d1665056 100755 (executable)
--- a/lib/ast_printer.h
+++ b/lib/ast_printer.h
@@ -17,20 +17,20 @@ class AST_Printer : public Statement::Visitor, public Expression::Visitor {
   void visitExprStmt(ExprStmt *) override;
   void visitReturnStmt(ReturnStmt *) override;
 
-  LBPLType visitBinaryExpr(BinaryExpr *) override;
-  LBPLType visitBreakExpr(BreakExpr *) override;
-  LBPLType visitContinueExpr(ContinueExpr *) override;
-  LBPLType visitUnaryExpr(UnaryExpr *) override;
-  LBPLType visitLiteralExpr(LiteralExpr *) override;
-  LBPLType visitGroupExpr(GroupingExpr *) override;
-  LBPLType visitSuperExpr(SuperExpr *) override;
-  LBPLType visitThisExpr(ThisExpr *) override;
-  LBPLType visitCallExpr(FnCallExpr *) override;
-  LBPLType visitGetFieldExpr(GetFieldExpr *) override;
-  LBPLType visitSetFieldExpr(SetFieldExpr *) override;
-  LBPLType visitTernaryExpr(TernaryExpr *) override;
-  LBPLType visitVarExpr(VariableExpr *) override;
-  LBPLType visitAssignExpr(AssignExpr *) override;
+  Value visitBinaryExpr(BinaryExpr *) override;
+  Value visitBreakExpr(BreakExpr *) override;
+  Value visitContinueExpr(ContinueExpr *) override;
+  Value visitUnaryExpr(UnaryExpr *) override;
+  Value visitLiteralExpr(LiteralExpr *) override;
+  Value visitGroupExpr(GroupingExpr *) override;
+  Value visitSuperExpr(SuperExpr *) override;
+  Value visitThisExpr(ThisExpr *) override;
+  Value visitCallExpr(FnCallExpr *) override;
+  Value visitGetFieldExpr(GetFieldExpr *) override;
+  Value visitSetFieldExpr(SetFieldExpr *) override;
+  Value visitTernaryExpr(TernaryExpr *) override;
+  Value visitVarExpr(VariableExpr *) override;
+  Value visitAssignExpr(AssignExpr *) override;
 };
 
 #endif

diff --git a/lib/builtin_methods.h b/lib/builtin_methods.h
index b04c01a076da6b3974662295c3ff9cc663c3a50e..24f0613e099c536f4fb4b3b894d9432834cf6da5 100644 (file)
--- a/lib/builtin_methods.h
+++ b/lib/builtin_methods.h
@@ -14,7 +14,7 @@ public:
 
   int arity() override { return 1; };
 
-  LBPLType call(Interpreter *, std::vector<LBPLType> &args) override {
+  Value call(Interpreter *, std::vector<Value> &args) override {
     if (std::holds_alternative<std::string>(args[0])) {
       std::cout << std::get<std::string>(args[0]) << std::endl;
     } else if (std::holds_alternative<int>(args[0])) {
@@ -37,7 +37,7 @@ public:
 
   int arity() override { return 0; };
 
-  LBPLType call(Interpreter *, std::vector<LBPLType> &args) override {
+  Value call(Interpreter *, std::vector<Value> &args) override {
     return std::chrono::duration_cast<std::chrono::milliseconds>(
                std::chrono::system_clock::now().time_since_epoch())
                .count() /

diff --git a/lib/environment.h b/lib/environment.h
index 6fa8ccea354d89d7df82d5c8399b0a45a60accf1..989fbc1d7bc10a52f2ec266a1750a2233089c07a 100755 (executable)
--- a/lib/environment.h
+++ b/lib/environment.h
@@ -12,7 +12,7 @@
 
 class Environment {
 public:
-  std::map<std::string, LBPLType> env;
+  std::map<std::string, Value> env;
   std::shared_ptr<Environment> enclosing;
 
 public:
@@ -26,17 +26,17 @@ public:
     return std::make_shared<Environment>(*this);
   }
 
-  void define(const std::string &, LBPLType &);
-  void define(const std::string &, LBPLType &&);
+  void define(const std::string &, Value &);
+  void define(const std::string &, Value &&);
 
   void printEnv(const std::string &&);
 
-  LBPLType get(std::shared_ptr<const Token> &);
-  LBPLType getAt(int, std::shared_ptr<const Token> &);
-  LBPLType getAt(int, const std::string &);
-  void assign(std::shared_ptr<const Token> &, LBPLType &);
-  void assign(std::shared_ptr<const Token> &, LBPLType &&);
-  void assignAt(int, std::shared_ptr<const Token> &, LBPLType &);
+  Value get(std::shared_ptr<const Token> &);
+  Value getAt(int, std::shared_ptr<const Token> &);
+  Value getAt(int, const std::string &);
+  void assign(std::shared_ptr<const Token> &, Value &);
+  void assign(std::shared_ptr<const Token> &, Value &&);
+  void assignAt(int, std::shared_ptr<const Token> &, Value &);
 };
 
 #endif

diff --git a/lib/expressions.h b/lib/expressions.h
index 81fa7ee5b53995488b7b8915930365817fef0369..86d1bebe20153884c7168f06bcbf84f394589127 100755 (executable)
--- a/lib/expressions.h
+++ b/lib/expressions.h
@@ -17,7 +17,7 @@ struct Expr {
       : line(line), column(column), file(filename) {}
 
   virtual ~Expr(){};
-  virtual LBPLType accept(Expression::Visitor *) { return nullptr; }
+  virtual Value accept(Expression::Visitor *) { return nullptr; }
 };
 
 struct BinaryExpr : public Expr {
@@ -36,7 +36,7 @@ struct BinaryExpr : public Expr {
       : left(std::move(left)), right(std::move(right)), op(op),
         Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitBinaryExpr(this);
   }
 };
@@ -45,7 +45,7 @@ struct BreakExpr : public Expr {
   BreakExpr(int line, int column, const std::string &file)
       : Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitBreakExpr(this);
   }
 };
@@ -53,7 +53,7 @@ struct BreakExpr : public Expr {
 struct ContinueExpr : public Expr {
   ContinueExpr(int line, int column, const std::string &file)
       : Expr(line, column, file) {}
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitContinueExpr(this);
   }
 };
@@ -65,7 +65,7 @@ struct UnaryExpr : public Expr {
   UnaryExpr(int line, int column, const std::string &file,
             std::unique_ptr<Expr> right, std::shared_ptr<const Token> &op)
       : right(std::move(right)), op(op), Expr(line, column, file) {}
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitUnaryExpr(this);
   }
 };
@@ -79,7 +79,7 @@ struct LiteralExpr : public Expr {
   LiteralExpr(int line, int column, const std::string &file,
               std::shared_ptr<const Token> &&literal)
       : token(literal), Expr(line, column, file) {}
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitLiteralExpr(this);
   }
 };
@@ -90,7 +90,7 @@ struct SuperExpr : public Expr {
   SuperExpr(int line, int column, const std::string &file,
             std::shared_ptr<const Token> &field)
       : field(field), Expr(line, column, file) {}
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitSuperExpr(this);
   }
 };
@@ -102,7 +102,7 @@ public:
   ThisExpr(int line, int column, const std::string &file, std::shared_ptr<const Token>& keyword)
       : keyword(keyword), Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitThisExpr(this);
   }
 };
@@ -113,7 +113,7 @@ struct GroupingExpr : public Expr {
   GroupingExpr(int line, int column, const std::string &file,
                std::unique_ptr<Expr> &expr)
       : expr(std::move(expr)), Expr(line, column, file) {}
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitGroupExpr(this);
   }
 };
@@ -124,7 +124,7 @@ struct VariableExpr : public Expr {
   VariableExpr(int line, int column, const std::string &file,
                std::shared_ptr<const Token> &variable)
       : variable(variable), Expr(line, column, file) {}
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitVarExpr(this);
   }
 };
@@ -138,7 +138,7 @@ struct AssignExpr : public Expr {
              std::unique_ptr<Expr> &value)
       : variable(variable), value(std::move(value)), Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitAssignExpr(this);
   }
 };
@@ -153,7 +153,7 @@ struct FnCallExpr : public Expr {
       : callee(std::move(callee)), args(std::move(args)),
         Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitCallExpr(this);
   }
 };
@@ -170,7 +170,7 @@ struct TernaryExpr : public Expr {
       : condition(std::move(condition)), trueBranch(std::move(trueBranch)),
         falseBranch(std::move(falseBranch)), Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitTernaryExpr(this);
   }
 };
@@ -184,7 +184,7 @@ struct GetFieldExpr : public Expr {
                std::shared_ptr<const Token> &field)
       : instance(std::move(instance)), field(field), Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitGetFieldExpr(this);
   }
 };
@@ -201,7 +201,7 @@ struct SetFieldExpr : public Expr {
       : instance(std::move(instance)), field(field), value(std::move(value)),
         Expr(line, column, file) {}
 
-  LBPLType accept(Expression::Visitor *visitor) {
+  Value accept(Expression::Visitor *visitor) {
     return visitor->visitSetFieldExpr(this);
   }
 };

diff --git a/lib/interpreter.h b/lib/interpreter.h
index 13650aa4eddbf5e24b81bde82d7b7cbc5031997f..4c4ccb4336e8d00faa6399d656f5703708abbb86 100644 (file)
--- a/lib/interpreter.h
+++ b/lib/interpreter.h
@@ -15,10 +15,10 @@ class BreakException {};
 class ContinueException {};
 class ReturnException {
 public:
-  LBPLType value;
+  Value value;
 
 public:
-  ReturnException(LBPLType &&value) : value(value) {}
+  ReturnException(Value &&value) : value(value) {}
 };
 
 class Interpreter : Statement::Visitor, Expression::Visitor {
@@ -29,13 +29,13 @@ private:
 private:
   void execute(std::unique_ptr<Stmt> &);
 
-  LBPLType evaluate(std::unique_ptr<Expr> &);
-  LBPLType lookupVariable(std::shared_ptr<const Token> &, Expr *);
-  bool isTruthy(const LBPLType &);
-  bool isTruthy(LBPLType &&);
+  Value evaluate(std::unique_ptr<Expr> &);
+  Value lookupVariable(std::shared_ptr<const Token> &, Expr *);
+  bool isTruthy(const Value &);
+  bool isTruthy(Value &&);
 
-  LBPLType performBinaryOperation(std::shared_ptr<const Token> &,
-                                  const LBPLType &, const LBPLType &);
+  Value performBinaryOperation(std::shared_ptr<const Token> &,
+                                  const Value &, const Value &);
 
   void visitFnStmt(FnStmt *) override;
   void visitVarStmt(VarStmt *) override;
@@ -47,20 +47,20 @@ private:
   void visitExprStmt(ExprStmt *) override;
   void visitReturnStmt(ReturnStmt *) override;
 
-  LBPLType visitBinaryExpr(BinaryExpr *) override;
-  LBPLType visitBreakExpr(BreakExpr *) override;
-  LBPLType visitContinueExpr(ContinueExpr *) override;
-  LBPLType visitUnaryExpr(UnaryExpr *) override;
-  LBPLType visitLiteralExpr(LiteralExpr *) override;
-  LBPLType visitGroupExpr(GroupingExpr *) override;
-  LBPLType visitSuperExpr(SuperExpr *) override;
-  LBPLType visitThisExpr(ThisExpr *) override;
-  LBPLType visitCallExpr(FnCallExpr *) override;
-  LBPLType visitGetFieldExpr(GetFieldExpr *) override;
-  LBPLType visitSetFieldExpr(SetFieldExpr *) override;
-  LBPLType visitTernaryExpr(TernaryExpr *) override;
-  LBPLType visitVarExpr(VariableExpr *) override;
-  LBPLType visitAssignExpr(AssignExpr *) override;
+  Value visitBinaryExpr(BinaryExpr *) override;
+  Value visitBreakExpr(BreakExpr *) override;
+  Value visitContinueExpr(ContinueExpr *) override;
+  Value visitUnaryExpr(UnaryExpr *) override;
+  Value visitLiteralExpr(LiteralExpr *) override;
+  Value visitGroupExpr(GroupingExpr *) override;
+  Value visitSuperExpr(SuperExpr *) override;
+  Value visitThisExpr(ThisExpr *) override;
+  Value visitCallExpr(FnCallExpr *) override;
+  Value visitGetFieldExpr(GetFieldExpr *) override;
+  Value visitSetFieldExpr(SetFieldExpr *) override;
+  Value visitTernaryExpr(TernaryExpr *) override;
+  Value visitVarExpr(VariableExpr *) override;
+  Value visitAssignExpr(AssignExpr *) override;
 
 public:
   void executeBlock(std::vector<std::unique_ptr<Stmt>> &,

diff --git a/lib/resolver.h b/lib/resolver.h
index 4783f6f370c27fb8a900605c6ef55b85953a2ab7..d4e0f930c5395de0ef66212de4d74f6c2c028bcd 100644 (file)
--- a/lib/resolver.h
+++ b/lib/resolver.h
@@ -65,20 +65,20 @@ private:
   void visitExprStmt(ExprStmt *) override;
   void visitReturnStmt(ReturnStmt *) override;
 
-  LBPLType visitBinaryExpr(BinaryExpr *) override;
-  LBPLType visitBreakExpr(BreakExpr *) override;
-  LBPLType visitContinueExpr(ContinueExpr *) override;
-  LBPLType visitUnaryExpr(UnaryExpr *) override;
-  LBPLType visitLiteralExpr(LiteralExpr *) override;
-  LBPLType visitGroupExpr(GroupingExpr *) override;
-  LBPLType visitSuperExpr(SuperExpr *) override;
-  LBPLType visitThisExpr(ThisExpr *) override;
-  LBPLType visitCallExpr(FnCallExpr *) override;
-  LBPLType visitGetFieldExpr(GetFieldExpr *) override;
-  LBPLType visitSetFieldExpr(SetFieldExpr *) override;
-  LBPLType visitTernaryExpr(TernaryExpr *) override;
-  LBPLType visitVarExpr(VariableExpr *) override;
-  LBPLType visitAssignExpr(AssignExpr *) override;
+  Value visitBinaryExpr(BinaryExpr *) override;
+  Value visitBreakExpr(BreakExpr *) override;
+  Value visitContinueExpr(ContinueExpr *) override;
+  Value visitUnaryExpr(UnaryExpr *) override;
+  Value visitLiteralExpr(LiteralExpr *) override;
+  Value visitGroupExpr(GroupingExpr *) override;
+  Value visitSuperExpr(SuperExpr *) override;
+  Value visitThisExpr(ThisExpr *) override;
+  Value visitCallExpr(FnCallExpr *) override;
+  Value visitGetFieldExpr(GetFieldExpr *) override;
+  Value visitSetFieldExpr(SetFieldExpr *) override;
+  Value visitTernaryExpr(TernaryExpr *) override;
+  Value visitVarExpr(VariableExpr *) override;
+  Value visitAssignExpr(AssignExpr *) override;
 
 public:
   Resolver(Interpreter *interpreter)

diff --git a/lib/visitor.h b/lib/visitor.h
index 37f75d86587e94c579cc0ad4a2ed4e2f5b8546d4..255105ed94a74378440d9945db03c025bbbaddef 100755 (executable)
--- a/lib/visitor.h
+++ b/lib/visitor.h
@@ -22,20 +22,20 @@ struct Visitor {
 
 namespace Expression {
 struct Visitor {
-  virtual LBPLType visitBinaryExpr(BinaryExpr *) = 0;
-  virtual LBPLType visitBreakExpr(BreakExpr *) = 0;
-  virtual LBPLType visitContinueExpr(ContinueExpr *) = 0;
-  virtual LBPLType visitUnaryExpr(UnaryExpr *) = 0;
-  virtual LBPLType visitLiteralExpr(LiteralExpr *) = 0;
-  virtual LBPLType visitGroupExpr(GroupingExpr *) = 0;
-  virtual LBPLType visitSuperExpr(SuperExpr *) = 0;
-  virtual LBPLType visitThisExpr(ThisExpr *) = 0;
-  virtual LBPLType visitCallExpr(FnCallExpr *) = 0;
-  virtual LBPLType visitGetFieldExpr(GetFieldExpr *) = 0;
-  virtual LBPLType visitSetFieldExpr(SetFieldExpr *) = 0;
-  virtual LBPLType visitTernaryExpr(TernaryExpr *) = 0;
-  virtual LBPLType visitVarExpr(VariableExpr *) = 0;
-  virtual LBPLType visitAssignExpr(AssignExpr *) = 0;
+  virtual Value visitBinaryExpr(BinaryExpr *) = 0;
+  virtual Value visitBreakExpr(BreakExpr *) = 0;
+  virtual Value visitContinueExpr(ContinueExpr *) = 0;
+  virtual Value visitUnaryExpr(UnaryExpr *) = 0;
+  virtual Value visitLiteralExpr(LiteralExpr *) = 0;
+  virtual Value visitGroupExpr(GroupingExpr *) = 0;
+  virtual Value visitSuperExpr(SuperExpr *) = 0;
+  virtual Value visitThisExpr(ThisExpr *) = 0;
+  virtual Value visitCallExpr(FnCallExpr *) = 0;
+  virtual Value visitGetFieldExpr(GetFieldExpr *) = 0;
+  virtual Value visitSetFieldExpr(SetFieldExpr *) = 0;
+  virtual Value visitTernaryExpr(TernaryExpr *) = 0;
+  virtual Value visitVarExpr(VariableExpr *) = 0;
+  virtual Value visitAssignExpr(AssignExpr *) = 0;
 };
 } // namespace Expression
 

diff --git a/src/LBPLClass.cpp b/src/LBPLClass.cpp
index ba83e5f7a38072408bb13d2b81fec0e81364064d..f4a2bd6069380c6720af7a3c5f66af48803d2e67 100644 (file)
--- a/src/LBPLClass.cpp
+++ b/src/LBPLClass.cpp
@@ -2,7 +2,7 @@
 #include "LBPLInstance.h"
 #include "interpreter.h"
 
-LBPLType LBPLClass::call(Interpreter *interpreter, std::vector<LBPLType> &args) {
+Value LBPLClass::call(Interpreter *interpreter, std::vector<Value> &args) {
     auto instance = std::make_shared<LBPLInstance>(this);
 
     LBPLFunc *init = findMethod("init");

diff --git a/src/LBPLFunction.cpp b/src/LBPLFunction.cpp
index 4d952599edbac6d83a86421dc88c5e538be594b3..c2a7a5e5c0f69e82b075b7af7235b06d468ca75d 100644 (file)
--- a/src/LBPLFunction.cpp
+++ b/src/LBPLFunction.cpp
@@ -13,7 +13,7 @@ void LBPLFunc::bind(std::shared_ptr<LBPLInstance> &instance) {
 
 int LBPLFunc::arity() { return stmt->args.size(); }
 
-LBPLType LBPLFunc::call(Interpreter *interpreter, std::vector<LBPLType> &args) {
+Value LBPLFunc::call(Interpreter *interpreter, std::vector<Value> &args) {
   auto env = std::make_shared<Environment>(closureEnv);
 
   for (int i = 0; i < stmt->args.size(); i++) {

diff --git a/src/LBPLInstance.cpp b/src/LBPLInstance.cpp
index 66df9f84bacb8cc64a2b740586313b4a4e441a67..73e0d3e1291ed418c6a6e4e81c9ffdfdd9f325ed 100644 (file)
--- a/src/LBPLInstance.cpp
+++ b/src/LBPLInstance.cpp
@@ -1,6 +1,6 @@
 #include "LBPLInstance.h"
 
-LBPLType LBPLInstance::get(const Token *name) {
+Value LBPLInstance::get(const Token *name) {
   if (fields.contains(name->lexeme)) {
     return fields.find(name->lexeme)->second;
   }
@@ -14,6 +14,6 @@ LBPLType LBPLInstance::get(const Token *name) {
   throw RuntimeError(name, "Undefined field '" + name->lexeme + "'.");
 }
 
-void LBPLInstance::set(const Token *name, LBPLType &value) {
+void LBPLInstance::set(const Token *name, Value &value) {
   fields.insert_or_assign(name->lexeme, value);
 }

diff --git a/src/ast_printer.cpp b/src/ast_printer.cpp
index 2fbb2c0520210bda16f471f52cab4256c47b87ca..04c89a8b62bb8ed167823589cb88bbabd7e7169a 100755 (executable)
--- a/src/ast_printer.cpp
+++ b/src/ast_printer.cpp
@@ -119,7 +119,7 @@ void AST_Printer::visitReturnStmt(ReturnStmt *stmt) {
   std::cout << ")\n";
 }
 
-LBPLType AST_Printer::visitBinaryExpr(BinaryExpr *expr) {
+Value AST_Printer::visitBinaryExpr(BinaryExpr *expr) {
   std::cout << "(" << expr->op->lexeme << " ";
   expr->left->accept(this);
   std::cout << " ";
@@ -128,51 +128,51 @@ LBPLType AST_Printer::visitBinaryExpr(BinaryExpr *expr) {
   return nullptr;
 }
 
-LBPLType AST_Printer::visitBreakExpr(BreakExpr *expr) {
+Value AST_Printer::visitBreakExpr(BreakExpr *expr) {
   std::cout << "(breaking)";
   return nullptr;
 }
 
-LBPLType AST_Printer::visitContinueExpr(ContinueExpr *expr) {
+Value AST_Printer::visitContinueExpr(ContinueExpr *expr) {
   std::cout << "(continuing)\n";
   return nullptr;
 }
 
-LBPLType AST_Printer::visitUnaryExpr(UnaryExpr *expr) {
+Value AST_Printer::visitUnaryExpr(UnaryExpr *expr) {
   std::cout << "(" << expr->op->lexeme << " ";
   expr->right->accept(this);
   std::cout << ")";
   return nullptr;
 }
 
-LBPLType AST_Printer::visitLiteralExpr(LiteralExpr *expr) {
+Value AST_Printer::visitLiteralExpr(LiteralExpr *expr) {
   std::cout << expr->token->lexeme;
   return nullptr;
 }
 
-LBPLType AST_Printer::visitSuperExpr(SuperExpr *expr) {
+Value AST_Printer::visitSuperExpr(SuperExpr *expr) {
   std::cout << "(super)";
   return nullptr;
 }
 
-LBPLType AST_Printer::visitThisExpr(ThisExpr *expr) {
+Value AST_Printer::visitThisExpr(ThisExpr *expr) {
   std::cout << "(this)";
   return nullptr;
 }
 
-LBPLType AST_Printer::visitAssignExpr(AssignExpr *expr) {
+Value AST_Printer::visitAssignExpr(AssignExpr *expr) {
   std::cout << "(assign ";
   expr->value->accept(this);
   std::cout << " to " << expr->variable->lexeme << ")";
   return nullptr;
 }
 
-LBPLType AST_Printer::visitGroupExpr(GroupingExpr *expr) {
+Value AST_Printer::visitGroupExpr(GroupingExpr *expr) {
   expr->expr->accept(this);
   return nullptr;
 }
 
-LBPLType AST_Printer::visitCallExpr(FnCallExpr *expr) {
+Value AST_Printer::visitCallExpr(FnCallExpr *expr) {
   std::cout << "(calling `";
   expr->callee->accept(this);
   std::cout << "` with parameters [";
@@ -185,13 +185,13 @@ LBPLType AST_Printer::visitCallExpr(FnCallExpr *expr) {
   return nullptr;
 }
 
-LBPLType AST_Printer::visitGetFieldExpr(GetFieldExpr *expr) {
+Value AST_Printer::visitGetFieldExpr(GetFieldExpr *expr) {
   std::cout << "get field `" << expr->field->lexeme << "` from ";
   expr->instance->accept(this);
   return nullptr;
 }
 
-LBPLType AST_Printer::visitSetFieldExpr(SetFieldExpr *expr) {
+Value AST_Printer::visitSetFieldExpr(SetFieldExpr *expr) {
   std::cout << "setting field `" << expr->field->lexeme << "` from ";
   expr->instance->accept(this);
   std::cout << " to ";
@@ -199,7 +199,7 @@ LBPLType AST_Printer::visitSetFieldExpr(SetFieldExpr *expr) {
   return nullptr;
 }
 
-LBPLType AST_Printer::visitTernaryExpr(TernaryExpr *expr) {
+Value AST_Printer::visitTernaryExpr(TernaryExpr *expr) {
   std::cout << "condition `";
   expr->condition->accept(this);
   std::cout << "` if true ";
@@ -209,7 +209,7 @@ LBPLType AST_Printer::visitTernaryExpr(TernaryExpr *expr) {
   return nullptr;
 }
 
-LBPLType AST_Printer::visitVarExpr(VariableExpr *expr) {
+Value AST_Printer::visitVarExpr(VariableExpr *expr) {
   std::cout << expr->variable->lexeme;
   return nullptr;
 }

diff --git a/src/environment.cpp b/src/environment.cpp
index ef9a29afa90b1ab7bf58ae0aa59c3fd7a2d6493f..f33df8bc83d30db19761abba869ec1c0fe8e87e0 100755 (executable)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -6,15 +6,15 @@
 #include <utility>
 #include <variant>
 
-void Environment::define(const std::string &name, LBPLType &value) {
+void Environment::define(const std::string &name, Value &value) {
   env.insert(std::make_pair(name, value));
 }
-void Environment::define(const std::string &name, LBPLType &&value) {
+void Environment::define(const std::string &name, Value &&value) {
   env.insert(std::make_pair(name, value));
 }
 
 
-LBPLType Environment::get(std::shared_ptr<const Token> &name) {
+Value Environment::get(std::shared_ptr<const Token> &name) {
   auto it = env.find(name->lexeme);
 
   if (it != env.end()) {
@@ -27,11 +27,11 @@ LBPLType Environment::get(std::shared_ptr<const Token> &name) {
   throw RuntimeError(name.get(), "Undefined name '"+name->lexeme+"'.");
 }
 
-LBPLType Environment::getAt(int depth, std::shared_ptr<const Token> &name) {
+Value Environment::getAt(int depth, std::shared_ptr<const Token> &name) {
   return getAt(depth, name->lexeme);
 }
 
-LBPLType Environment::getAt(int depth, const std::string &name) {
+Value Environment::getAt(int depth, const std::string &name) {
   if (depth > 0) {
     return enclosing->getAt(depth-1, name);
   }
@@ -40,7 +40,7 @@ LBPLType Environment::getAt(int depth, const std::string &name) {
   return it != env.end() ? it->second : nullptr;
 }
 
-void Environment::assign(std::shared_ptr<const Token> &name, LBPLType &value) {
+void Environment::assign(std::shared_ptr<const Token> &name, Value &value) {
   if (env.contains(name->lexeme)) {
     env.insert_or_assign(name->lexeme, value);
   } else if (enclosing) {
@@ -50,11 +50,11 @@ void Environment::assign(std::shared_ptr<const Token> &name, LBPLType &value) {
   }
 }
 
-void Environment::assign(std::shared_ptr<const Token> &name, LBPLType &&value) {
+void Environment::assign(std::shared_ptr<const Token> &name, Value &&value) {
   assign(name, value);
 }
 
-void Environment::assignAt(int depth, std::shared_ptr<const Token> &name, LBPLType &value) {
+void Environment::assignAt(int depth, std::shared_ptr<const Token> &name, Value &value) {
   if (depth > 0) {
     enclosing->assignAt(depth-1, name, value);
   }

diff --git a/src/interpreter.cpp b/src/interpreter.cpp
index 58fc6b218f687dcc09e80c03a3decba0a3c14db1..4ba86d89051164a4df1511100bf5c23114f1f245 100644 (file)
--- a/src/interpreter.cpp
+++ b/src/interpreter.cpp
@@ -31,7 +31,7 @@ void Interpreter::visitFnStmt(FnStmt *stmt) {
 }
 
 void Interpreter::visitVarStmt(VarStmt *stmt) {
-  LBPLType value;
+  Value value;
   if (stmt->value) {
     value = stmt->value->accept(this);
   }
@@ -40,7 +40,7 @@ void Interpreter::visitVarStmt(VarStmt *stmt) {
 }
 
 void Interpreter::visitClassStmt(ClassStmt *stmt) {
-  LBPLType superclass;
+  Value superclass;
   currentEnv->define(stmt->name->lexeme, nullptr);
 
   if (stmt->superclass) {
@@ -129,20 +129,20 @@ void Interpreter::visitReturnStmt(ReturnStmt *stmt) {
   throw ReturnException(stmt->value->accept(this));
 }
 
-LBPLType Interpreter::visitBinaryExpr(BinaryExpr *expr) {
-  LBPLType left = expr->left->accept(this);
-  LBPLType right = expr->right->accept(this);
+Value Interpreter::visitBinaryExpr(BinaryExpr *expr) {
+  Value left = expr->left->accept(this);
+  Value right = expr->right->accept(this);
 
   return performBinaryOperation(expr->op, left, right);
 }
 
-LBPLType Interpreter::visitBreakExpr(BreakExpr *) { throw BreakException(); }
-LBPLType Interpreter::visitContinueExpr(ContinueExpr *) {
+Value Interpreter::visitBreakExpr(BreakExpr *) { throw BreakException(); }
+Value Interpreter::visitContinueExpr(ContinueExpr *) {
   throw ContinueException();
 }
 
-LBPLType Interpreter::visitUnaryExpr(UnaryExpr *expr) {
-  LBPLType right = expr->right->accept(this);
+Value Interpreter::visitUnaryExpr(UnaryExpr *expr) {
+  Value right = expr->right->accept(this);
 
   if (expr->op->type == TokenType::Minus) {
     if (std::holds_alternative<int>(right)) {
@@ -157,7 +157,7 @@ LBPLType Interpreter::visitUnaryExpr(UnaryExpr *expr) {
   return nullptr;
 }
 
-LBPLType Interpreter::visitLiteralExpr(LiteralExpr *expr) {
+Value Interpreter::visitLiteralExpr(LiteralExpr *expr) {
   if (expr->token->type == TokenType::True) {
     return true;
   } else if (expr->token->type == TokenType::False) {
@@ -180,17 +180,17 @@ LBPLType Interpreter::visitLiteralExpr(LiteralExpr *expr) {
   return nullptr;
 }
 
-LBPLType Interpreter::visitGroupExpr(GroupingExpr *expr) {
+Value Interpreter::visitGroupExpr(GroupingExpr *expr) {
   return expr->expr->accept(this);
 }
 
-LBPLType Interpreter::visitSuperExpr(SuperExpr *) { return nullptr; }
-LBPLType Interpreter::visitThisExpr(ThisExpr *expr) { return lookupVariable(expr->keyword, expr); }
+Value Interpreter::visitSuperExpr(SuperExpr *) { return nullptr; }
+Value Interpreter::visitThisExpr(ThisExpr *expr) { return lookupVariable(expr->keyword, expr); }
 
-LBPLType Interpreter::visitCallExpr(FnCallExpr *expr) {
-  LBPLType callee = expr->callee->accept(this);
+Value Interpreter::visitCallExpr(FnCallExpr *expr) {
+  Value callee = expr->callee->accept(this);
 
-  std::vector<LBPLType> args;
+  std::vector<Value> args;
   args.reserve(expr->args.size());
 
   for (auto &&arg : expr->args) {
@@ -217,8 +217,8 @@ LBPLType Interpreter::visitCallExpr(FnCallExpr *expr) {
                      "Can only call a function or class initializer.");
 }
 
-LBPLType Interpreter::visitGetFieldExpr(GetFieldExpr *expr) {
-  LBPLType instance = expr->instance->accept(this);
+Value Interpreter::visitGetFieldExpr(GetFieldExpr *expr) {
+  Value instance = expr->instance->accept(this);
   if (std::holds_alternative<std::shared_ptr<LBPLInstance>>(instance)) {
     return std::get<std::shared_ptr<LBPLInstance>>(instance)->get(
         expr->field.get());
@@ -228,11 +228,11 @@ LBPLType Interpreter::visitGetFieldExpr(GetFieldExpr *expr) {
                      "Only instances of classes can have properties");
 }
 
-LBPLType Interpreter::visitSetFieldExpr(SetFieldExpr *expr) {
-  LBPLType instance = expr->instance->accept(this);
+Value Interpreter::visitSetFieldExpr(SetFieldExpr *expr) {
+  Value instance = expr->instance->accept(this);
 
   if (std::holds_alternative<std::shared_ptr<LBPLInstance>>(instance)) {
-    LBPLType value = expr->value->accept(this);
+    Value value = expr->value->accept(this);
     std::get<std::shared_ptr<LBPLInstance>>(instance)->set(expr->field.get(),
                                                            value);
   } else {
@@ -243,7 +243,7 @@ LBPLType Interpreter::visitSetFieldExpr(SetFieldExpr *expr) {
   return nullptr;
 }
 
-LBPLType Interpreter::visitTernaryExpr(TernaryExpr *expr) {
+Value Interpreter::visitTernaryExpr(TernaryExpr *expr) {
   if (isTruthy(expr->condition->accept(this))) {
     return expr->trueBranch->accept(this);
   }
@@ -251,11 +251,11 @@ LBPLType Interpreter::visitTernaryExpr(TernaryExpr *expr) {
   return expr->falseBranch->accept(this);
 }
 
-LBPLType Interpreter::visitVarExpr(VariableExpr *expr) {
+Value Interpreter::visitVarExpr(VariableExpr *expr) {
   return lookupVariable(expr->variable, expr);
 }
-LBPLType Interpreter::visitAssignExpr(AssignExpr *expr) {
-  LBPLType value = expr->value->accept(this);
+Value Interpreter::visitAssignExpr(AssignExpr *expr) {
+  Value value = expr->value->accept(this);
 
   auto it = locals.find(expr);
   if (it == locals.end()) {
@@ -269,15 +269,15 @@ LBPLType Interpreter::visitAssignExpr(AssignExpr *expr) {
 
 void Interpreter::execute(std::unique_ptr<Stmt> &stmt) { stmt->accept(this); }
 
-LBPLType Interpreter::evaluate(std::unique_ptr<Expr> &expr) {
+Value Interpreter::evaluate(std::unique_ptr<Expr> &expr) {
   return expr->accept(this);
 }
 
-LBPLType Interpreter::performBinaryOperation(std::shared_ptr<const Token> &op,
-                                             const LBPLType &left,
-                                             const LBPLType &right) {
+Value Interpreter::performBinaryOperation(std::shared_ptr<const Token> &op,
+                                             const Value &left,
+                                             const Value &right) {
   auto performIntOp = [](int l, int r,
-                         std::shared_ptr<const Token> &op) -> LBPLType {
+                         std::shared_ptr<const Token> &op) -> Value {
     switch (op->type) {
     case TokenType::Plus:
       return l + r;
@@ -313,7 +313,7 @@ LBPLType Interpreter::performBinaryOperation(std::shared_ptr<const Token> &op,
   };
 
   auto performDoubleOp = [](double l, double r,
-                            std::shared_ptr<const Token> &op) -> LBPLType {
+                            std::shared_ptr<const Token> &op) -> Value {
     switch (op->type) {
     case TokenType::Plus:
       return l + r;
@@ -344,7 +344,7 @@ LBPLType Interpreter::performBinaryOperation(std::shared_ptr<const Token> &op,
   };
 
   auto performStringOp = [](const std::string &l, const std::string &r,
-                            std::shared_ptr<const Token> &op) -> LBPLType {
+                            std::shared_ptr<const Token> &op) -> Value {
     if (op->type == TokenType::Plus) {
       return l + r;
     } else {
@@ -353,7 +353,7 @@ LBPLType Interpreter::performBinaryOperation(std::shared_ptr<const Token> &op,
   };
 
   return std::visit(
-      [&](const auto &l, const auto &r) -> LBPLType {
+      [&](const auto &l, const auto &r) -> Value {
         using L = std::decay_t<decltype(l)>;
         using R = std::decay_t<decltype(r)>;
 
@@ -426,7 +426,7 @@ void Interpreter::executeBlock(std::vector<std::unique_ptr<Stmt>> &body,
   currentEnv = prev;
 }
 
-bool Interpreter::isTruthy(const LBPLType &value) {
+bool Interpreter::isTruthy(const Value &value) {
   if (std::holds_alternative<std::nullptr_t>(value)) {
     return std::get<std::nullptr_t>(value) != nullptr;
   } else if (std::holds_alternative<bool>(value)) {
@@ -440,9 +440,9 @@ bool Interpreter::isTruthy(const LBPLType &value) {
   return false;
 }
 
-bool Interpreter::isTruthy(LBPLType &&value) { return isTruthy(value); }
+bool Interpreter::isTruthy(Value &&value) { return isTruthy(value); }
 
-LBPLType Interpreter::lookupVariable(std::shared_ptr<const Token> &name,
+Value Interpreter::lookupVariable(std::shared_ptr<const Token> &name,
                                      Expr *expr) {
   auto it = locals.find(expr);
 

diff --git a/src/resolver.cpp b/src/resolver.cpp
index 90bc24f668b9ccda044d1b5dfc72aec09412a306..29214ceaf59ee0cd69c41e9a916820ad5c84695b 100644 (file)
--- a/src/resolver.cpp
+++ b/src/resolver.cpp
@@ -164,39 +164,39 @@ void Resolver::visitReturnStmt(ReturnStmt *ret) {
   }
 }
 
-LBPLType Resolver::visitBinaryExpr(BinaryExpr *expr) {
+Value Resolver::visitBinaryExpr(BinaryExpr *expr) {
   expr->left->accept(this);
   expr->right->accept(this);
   return nullptr;
 }
 
-LBPLType Resolver::visitBreakExpr(BreakExpr *expr) {
+Value Resolver::visitBreakExpr(BreakExpr *expr) {
   if (loops <= 0) {
     throw SyntaxError(expr, "Can't break from outside of a loop.");
   }
   return nullptr;
 }
 
-LBPLType Resolver::visitContinueExpr(ContinueExpr *expr) {
+Value Resolver::visitContinueExpr(ContinueExpr *expr) {
   if (loops <= 0) {
     throw SyntaxError(expr, "Can't break from outside of a loop.");
   }
   return nullptr;
 }
 
-LBPLType Resolver::visitUnaryExpr(UnaryExpr *expr) {
+Value Resolver::visitUnaryExpr(UnaryExpr *expr) {
   expr->right->accept(this);
   return nullptr;
 }
 
-LBPLType Resolver::visitLiteralExpr(LiteralExpr *) { return nullptr; }
+Value Resolver::visitLiteralExpr(LiteralExpr *) { return nullptr; }
 
-LBPLType Resolver::visitGroupExpr(GroupingExpr *expr) {
+Value Resolver::visitGroupExpr(GroupingExpr *expr) {
   expr->expr->accept(this);
   return nullptr;
 }
 
-LBPLType Resolver::visitSuperExpr(SuperExpr *expr) {
+Value Resolver::visitSuperExpr(SuperExpr *expr) {
   if (currentClass == ClassType::None) {
     throw SyntaxError(expr, "Can't access 'super' from outside of class body.");
   } else if (currentClass != ClassType::Subclass) {
@@ -208,12 +208,12 @@ LBPLType Resolver::visitSuperExpr(SuperExpr *expr) {
   return nullptr;
 }
 
-LBPLType Resolver::visitThisExpr(ThisExpr *expr) {
+Value Resolver::visitThisExpr(ThisExpr *expr) {
   resolveLocal(expr, "this");
   return nullptr;
 }
 
-LBPLType Resolver::visitCallExpr(FnCallExpr *expr) {
+Value Resolver::visitCallExpr(FnCallExpr *expr) {
   expr->callee->accept(this);
 
   for (auto &&arg : expr->args) {
@@ -222,25 +222,25 @@ LBPLType Resolver::visitCallExpr(FnCallExpr *expr) {
   return nullptr;
 }
 
-LBPLType Resolver::visitGetFieldExpr(GetFieldExpr *expr) {
+Value Resolver::visitGetFieldExpr(GetFieldExpr *expr) {
   expr->instance->accept(this);
   return nullptr;
 }
 
-LBPLType Resolver::visitSetFieldExpr(SetFieldExpr *expr) {
+Value Resolver::visitSetFieldExpr(SetFieldExpr *expr) {
   expr->value->accept(this);
   expr->instance->accept(this);
   return nullptr;
 }
 
-LBPLType Resolver::visitTernaryExpr(TernaryExpr *expr) {
+Value Resolver::visitTernaryExpr(TernaryExpr *expr) {
   expr->condition->accept(this);
   expr->trueBranch->accept(this);
   expr->falseBranch->accept(this);
   return nullptr;
 }
 
-LBPLType Resolver::visitVarExpr(VariableExpr *expr) {
+Value Resolver::visitVarExpr(VariableExpr *expr) {
   if (!scopes.empty() && scopes.back().contains(expr->variable->lexeme) &&
       scopes.back().find(expr->variable->lexeme)->second != VarState::Ready) {
     throw SyntaxError(expr, "You are trying to read the value of a variable "
@@ -251,7 +251,7 @@ LBPLType Resolver::visitVarExpr(VariableExpr *expr) {
   return nullptr;
 }
 
-LBPLType Resolver::visitAssignExpr(AssignExpr *expr) {
+Value Resolver::visitAssignExpr(AssignExpr *expr) {
   expr->value->accept(this);
   resolveLocal(expr, expr->variable.get());
   return nullptr;