Subscript Operator

CMakeLists.txt

@@ -19,7 +19,6 @@ include_directories("${CMAKE_SOURCE_DIR}/include/")
 add_library(AST SHARED
   src/ast/AddressOf.cpp
   src/ast/Allocation.cpp
-  src/ast/ArrayAccess.cpp
   src/ast/ArrayType.cpp
   src/ast/Assign.cpp
   src/ast/BaseType.cpp
@@ -30,6 +29,7 @@ add_library(AST SHARED
   src/ast/ClassType.cpp
   src/ast/ClassTypeDecl.cpp
   src/ast/ClassTypeDef.cpp
+  src/ast/ConstructorCall.cpp
   src/ast/ConstructorDecl.cpp
   src/ast/ConstructorDef.cpp
   src/ast/Deletion.cpp
@@ -54,9 +54,9 @@ add_library(AST SHARED
   src/ast/Program.cpp
   src/ast/ReferenceType.cpp
   src/ast/Return.cpp
-  src/ast/Scope.cpp
   src/ast/SizeOf.cpp
   src/ast/StringLiteral.cpp
+  src/ast/SubscriptOp.cpp
   src/ast/TertiaryExpr.cpp
   src/ast/Throw.cpp
   src/ast/TypeCast.cpp

README.md

@@ -107,6 +107,7 @@ Progressively changing to adopt new features of the language(s).
                   | "new" type [ "(" litExpr ("," litExpr)* ")" ] ";"
                   | "&" objExpr
                   | "!" objExpr
+                  | objExpr "[" expr "]
                   | objExpr
 
     objExpr      -> funCall (objExprOp)*
@@ -131,8 +132,8 @@ Progressively changing to adopt new features of the language(s).
                   | STRING_LITERAL
                   | "true"
                   | "false"
-                  | "(" exp ")"
-                  | exp
+                  | "(" expr ")"
+                  | expr
 
 * * *
 

include/AST.h

@@ -4,7 +4,6 @@
 
 #include "ast/AddressOf.h"
 #include "ast/Allocation.h"
-#include "ast/ArrayAccess.h"
 #include "ast/ArrayType.h"
 #include "ast/Assign.h"
 #include "ast/BaseType.h"
@@ -15,6 +14,7 @@
 #include "ast/ClassType.h"
 #include "ast/ClassTypeDecl.h"
 #include "ast/ClassTypeDef.h"
+#include "ast/ConstructorCall.h"
 #include "ast/ConstructorDecl.h"
 #include "ast/ConstructorDef.h"
 #include "ast/Decl.h"
@@ -47,6 +47,7 @@
 #include "ast/SizeOf.h"
 #include "ast/Stmt.h"
 #include "ast/StringLiteral.h"
+#include "ast/SubscriptOp.h"
 #include "ast/TertiaryExpr.h"
 #include "ast/Throw.h"
 #include "ast/Type.h"

include/ASTVisitor.h

@@ -4,7 +4,6 @@ namespace ACC {
 
 class AddressOf;
 class Allocation;
-class ArrayAccess;
 class ArrayType;
 class Assign;
 class BaseType;
@@ -15,6 +14,7 @@ class CharLiteral;
 class ClassType;
 class ClassTypeDecl;
 class ClassTypeDef;
+class ConstructorCall;
 class ConstructorDecl;
 class ConstructorDef;
 class Deletion;
@@ -41,6 +41,7 @@ class ReferenceType;
 class Return;
 class SizeOf;
 class StringLiteral;
+class SubscriptOp;
 class TertiaryExpr;
 class Throw;
 class TypeCast;
@@ -58,7 +59,6 @@ template <typename T> class ASTVisitor {
 
   virtual T visit(AddressOf &ao) = 0;
   virtual T visit(Allocation &a) = 0;
-  virtual T visit(ArrayAccess &aa) = 0;
   virtual T visit(ArrayType &at) = 0;
   virtual T visit(Assign &as) = 0;
   virtual T visit(BaseType &bt) = 0;
@@ -69,6 +69,7 @@ template <typename T> class ASTVisitor {
   virtual T visit(ClassType &ct) = 0;
   virtual T visit(ClassTypeDecl &ctd) = 0;
   virtual T visit(ClassTypeDef &ctd) = 0;
+  virtual T visit(ConstructorCall &cc) = 0;
   virtual T visit(ConstructorDecl &cd) = 0;
   virtual T visit(ConstructorDef &cd) = 0;
   virtual T visit(Deletion &d) = 0;
@@ -95,6 +96,7 @@ template <typename T> class ASTVisitor {
   virtual T visit(Return &r) = 0;
   virtual T visit(SizeOf &so) = 0;
   virtual T visit(StringLiteral &sl) = 0;
+  virtual T visit(SubscriptOp &so) = 0;
   virtual T visit(TertiaryExpr &t) = 0;
   virtual T visit(Throw &t) = 0;
   virtual T visit(TypeCast &tc) = 0;

include/ast/AddressOf.h

@@ -12,8 +12,6 @@ class AddressOf : public Expr, public atl::enable_shared_from_this<AddressOf> {
 
   AddressOf(const atl::shared_ptr<Expr> &p_addressOfExpr);
 
-  atl::string getSignature() const override;
-
   bool operator==(Expr &rhs) const override;
   bool operator!=(Expr &rhs) const override;
 

include/ast/Allocation.h

@@ -18,8 +18,7 @@ class Allocation : public Expr,
 
   virtual ~Allocation() {}
 
-  atl::string getSignature() const override;
-
+
   bool operator==(Expr &rhs) const override;
   bool operator!=(Expr &rhs) const override;
 

include/ast/ArrayType.h

@@ -13,11 +13,9 @@ class ArrayType : public PointerType {
   ArrayType(const atl::shared_ptr<Type> &p_type,
             const atl::shared_ptr<Expr> &p_size);
 
-  int getBytes() const override;
+  unsigned int getBytes() const override;
 
-  atl::string getSignature() const override;
-
-  bool operator==(Type &rhs) const override;
+    bool operator==(Type &rhs) const override;
   bool operator!=(Type &rhs) const override;
 
   bool operator==(const ArrayType &rhs) const;

include/ast/BaseType.h

@@ -12,11 +12,9 @@ class BaseType : public Type, public atl::enable_shared_from_this<BaseType> {
 
   BaseType(const PrimitiveType p_pType);
 
-  int getBytes() const override;
+  unsigned int getBytes() const override;
 
-  atl::string getSignature() const override;
-
-  bool operator==(Type &rhs) const override;
+    bool operator==(Type &rhs) const override;
   bool operator!=(Type &rhs) const override;
 
   bool operator==(const BaseType &rhs) const;

include/ast/BinOp.h

@@ -16,8 +16,7 @@ class BinOp : public Expr, public atl::enable_shared_from_this<BinOp> {
   BinOp(const atl::shared_ptr<Expr> &p_lhs, const Op p_operation,
         const atl::shared_ptr<Expr> &p_rhs);
 
-  atl::string getSignature() const override;
-
+
   bool operator==(Expr &rhs) const override;
   bool operator!=(Expr &rhs) const override;
 

include/ast/Block.h

@@ -12,6 +12,7 @@ class Block : public Stmt,
               public atl::enable_shared_from_this<Block> {
 
 public:
+  unsigned int stmtsChecked = 0;
   atl::vector<atl::shared_ptr<Stmt>> stmts;
 
   Block(const atl::vector<atl::shared_ptr<Stmt>> &p_stmts);
@@ -23,6 +24,31 @@ class Block : public Stmt,
 
   atl::string astClass() const override { return "Block"; }
 
+  /* Scope Methods */
+  virtual atl::shared_ptr<ClassTypeDecl> findClassDecl(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<ClassTypeDef> findClassDef(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<FunDecl>
+  findFunDecl(const FunSignature &funSignature,
+              const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<FunDecl> findFunDeclLocal(
+      const FunSignature &funSignature,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<VarDecl>
+  findVarDecl(const atl::shared_ptr<Identifier> identifier,
+              const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<VarDecl> findVarDeclLocal(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
   VISITOR_ACCEPTORS
 };
 

include/ast/BoolLiteral.h

@@ -11,8 +11,7 @@ class BoolLiteral : public Literal,
 public:
   BoolLiteral(const atl::string &p_literal);
 
-  atl::string getSignature() const override;
-
+
   bool operator==(Expr &rhs) const override;
   bool operator!=(Expr &rhs) const override;
 

include/ast/CharLiteral.h

@@ -11,8 +11,7 @@ class CharLiteral : public Literal,
 public:
   CharLiteral(const atl::string &p_literal);
 
-  atl::string getSignature() const override;
-
+
   bool operator==(Expr &rhs) const override;
   bool operator!=(Expr &rhs) const override;
 

include/ast/ClassType.h

@@ -15,9 +15,7 @@ class ClassType : public Type, public atl::enable_shared_from_this<ClassType> {
 
   ClassType(const atl::shared_ptr<Identifier> &p_identifier);
 
-  int getBytes() const override;
-
-  atl::string getSignature() const override;
+  unsigned int getBytes() const override;
 
   bool operator==(Type &rhs) const override;
   bool operator!=(Type &rhs) const override;

include/ast/ClassTypeDecl.h

@@ -28,6 +28,31 @@ class ClassTypeDecl : public Decl,
 
   atl::string astClass() const override { return "ClassTypeDecl"; }
 
+  /* Scope Methods */
+  virtual atl::shared_ptr<ClassTypeDecl> findClassDecl(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<ClassTypeDef> findClassDef(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<FunDecl>
+  findFunDecl(const FunSignature &funSignature,
+              const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<FunDecl> findFunDeclLocal(
+      const FunSignature &funSignature,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<VarDecl>
+  findVarDecl(const atl::shared_ptr<Identifier> identifier,
+              const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<VarDecl> findVarDeclLocal(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
   VISITOR_ACCEPTORS
 };
 

include/ast/ClassTypeDef.h

@@ -26,6 +26,35 @@ class ClassTypeDef : public ClassTypeDecl {
 
   atl::string astClass() const override { return "ClassTypeDef"; }
 
+  /* Scope Methods */
+  virtual atl::shared_ptr<ClassTypeDecl> findClassDecl(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<ClassTypeDef> findClassDef(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  atl::shared_ptr<ConstructorDecl>
+  findConstructorDecl(const FunSignature &ctorSignature,
+                      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const;
+
+  virtual atl::shared_ptr<FunDecl>
+  findFunDecl(const FunSignature &funSignature,
+              const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<FunDecl> findFunDeclLocal(
+      const FunSignature &funSignature,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<VarDecl>
+  findVarDecl(const atl::shared_ptr<Identifier> identifier,
+              const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
+  virtual atl::shared_ptr<VarDecl> findVarDeclLocal(
+      const atl::shared_ptr<Identifier> identifier,
+      const atl::shared_ptr<Decl> &exemptDecl = nullptr) const override;
+
   VISITOR_ACCEPTORS
 };
 

include/ast/ConstructorCall.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "ConstructorDecl.h"
+#include "Expr.h"
+#include "Identifier.h"
+#include "Type.h"
+
+namespace ACC {
+
+class ConstructorCall : public Expr,
+                        public atl::enable_shared_from_this<ConstructorCall> {
+
+public:
+  atl::shared_ptr<Identifier> constructorIdentifier;
+  atl::vector<atl::shared_ptr<Expr>> constructorArgs;
+  atl::shared_ptr<ConstructorDecl> constructorDecl;
+
+  ConstructorCall(const atl::shared_ptr<Identifier> &p_ctorIdentifier,
+                  const atl::vector<atl::shared_ptr<Expr>> &p_ctorArgs);
+
+  bool operator==(Expr &rhs) const override;
+  bool operator!=(Expr &rhs) const override;
+
+  bool operator==(const ConstructorCall &rhs) const;
+  bool operator!=(const ConstructorCall &rhs) const;
+
+  atl::shared_ptr<ConstructorCall> getptr() { return shared_from_this(); }
+
+  atl::string astClass() const override { return "ConstructorCall"; }
+
+  VISITOR_ACCEPTORS
+};
+
+} // namespace ACC