fix #12

pmqtt · Jan 7, 2025 · 140b658 · 140b658
1 parent b59f6a6
commit 140b658
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/include/ast/ConstantDeclarationNode.h b/include/ast/ConstantDeclarationNode.h
@@ -8,11 +8,12 @@
 class ConstantDeclarationNode : public AstNode, public std::enable_shared_from_this<ConstantDeclarationNode> {
 public:
   ~ConstantDeclarationNode() = default;
-  ConstantDeclarationNode(const std::string& var_name, const AstPtr& expression);
+  ConstantDeclarationNode(const std::string& var_name, const AstPtr& type, const AstPtr& expression);
   void accept(const std::shared_ptr<Visitor>& v) override;
 
 private:
   std::string _var_name;
+  AstPtr _type;
   AstPtr _expression;
 };
 

diff --git a/include/ast/VariableDeclarationNode.h b/include/ast/VariableDeclarationNode.h
@@ -8,7 +8,7 @@
 class VariableDeclarationNode : public AstNode, public std::enable_shared_from_this<VariableDeclarationNode> {
 public:
   ~VariableDeclarationNode() = default;
-  VariableDeclarationNode(const std::string& var_name, const AstPtr& expression);
+  VariableDeclarationNode(const std::string& var_name, const AstPtr& type, const AstPtr& expression);
   void accept(const std::shared_ptr<Visitor>& v) override;
   auto var_name() const -> const std::string& {
     return _var_name;
@@ -19,6 +19,7 @@ class VariableDeclarationNode : public AstNode, public std::enable_shared_from_t
 
 private:
   std::string _var_name;
+  AstPtr _type;
   AstPtr _expression;
 };
 

diff --git a/src/Parser.cpp b/src/Parser.cpp
@@ -207,7 +207,7 @@ auto Parser::parse_variable_declaration() -> ParserResult {
     if (!accept(TokenKind::SEMICOLON)) {
     }
     _context.pop();
-    return {std::make_shared<VariableDeclarationNode>(var_name, expression.result())};
+    return {std::make_shared<VariableDeclarationNode>(var_name, type.result(), expression.result())};
   }
   return Epsilon;
 }
@@ -242,7 +242,7 @@ auto Parser::parse_constant_declaration() -> ParserResult {
     if (!accept(TokenKind::SEMICOLON)) {
     }
     _context.pop();
-    return {std::make_shared<ConstantDeclarationNode>(var_name, expression.result())};
+    return {std::make_shared<ConstantDeclarationNode>(var_name, type.result(), expression.result())};
   }
   return Epsilon;
 }

diff --git a/src/ast/ConstantDeclarationNode.cpp b/src/ast/ConstantDeclarationNode.cpp
@@ -1,8 +1,9 @@
 #include "ConstantDeclarationNode.h"
 #include "Visitor.h"
 
-ConstantDeclarationNode::ConstantDeclarationNode(const std::string& var_name, const AstPtr& expression)
-    : _var_name(var_name), _expression(expression) {
+ConstantDeclarationNode::ConstantDeclarationNode(const std::string& var_name, const AstPtr& type,
+                                                 const AstPtr& expression)
+    : _var_name(var_name), _type(type), _expression(expression) {
   // Constructor implementation
 }
 

diff --git a/src/ast/VariableDeclarationNode.cpp b/src/ast/VariableDeclarationNode.cpp
@@ -1,8 +1,10 @@
+#include "AstNode.h"
 #include "Visitor.h"
 #include "VariableDeclarationNode.h"
 
-VariableDeclarationNode::VariableDeclarationNode(const std::string& var_name, const AstPtr& expression)
-    : _var_name(var_name), _expression(expression) {
+VariableDeclarationNode::VariableDeclarationNode(const std::string& var_name, const AstPtr& type,
+                                                 const AstPtr& expression)
+    : _var_name(var_name), _type(type), _expression(expression) {
   // Constructor implementation
 }