Changeset 77a3f41

Timestamp:

May 9, 2019, 5:53:29 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

14cebb7a

Parents:

3e46cc8

Message:

Added ObjectDecl? to new AST

Location:

src/AST

Files:

• Decl.hpp (modified) (3 diffs)
• porting.md (modified) (1 diff)

src/AST/Decl.hpp

@@ -34 +34 @@
 class Attribute;
 class Expr;
+class Init;
 class TypeDecl;
 
@@ -84 +85 @@
 
         /// Get type of this declaration. May be generated by subclass
-        virtual const Type* type() const = 0;
+        virtual const Type* get_type() const = 0;
         /// Set type of this declaration. May be verified by subclass
         virtual void set_type(Type*) = 0;
@@ -91 +92 @@
 private:
         virtual DeclWithType* clone() const override = 0;
+};
+
+/// Object declaration `Foo foo = 42;`
+class ObjectDecl final : public DeclWithType {
+public:
+        ptr<Type> type;
+        ptr<Init> init;
+        ptr<Expr> bitfieldWidth;
+
+        ObjectDecl( const CodeLocation& loc, const std::string& name, Type* type, Init* init = nullptr,
+                Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C, Expr* bitWd = nullptr, 
+                std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {})
+        : DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), type( type ), 
+          init( init ), bitfieldWidth( bitWd ) {}
+        
+        const Type* get_type() const override { return type; }
+        void set_type( Type* ty ) override { type = ty; }
+
+        DeclWithType* accept( Visitor& v ) override { return v.visit( this ); }
+private:
+        ObjectDecl* clone() const override { return new ObjectDecl{ *this }; }
 };
 

src/AST/porting.md

@@ -82 +82 @@
 * When `SymTab::Validate::Pass2` is rewritten, update comment on `mangleName` with new name of pass
 * `get_scopedMangleName()` => `scopedMangleName()`
-* `get_type()` => `type()`
-  * now returns `const Type*` so can't be inadvertently mutated
+* `get_type()` now returns `const Type*` so can't be inadvertently mutated
+  * still with `get_` name so it doesn't conflict with subclass field names
+
+`ObjectDecl`
+* changed constructor parameter order for better defaults
+  * allows `newObject` as just default settings
 
 `EnumDecl`