Changeset b859f59

Timestamp:

Sep 22, 2022, 4:08:06 PM (20 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

3f7e68b7

Parents:

5d8dae7

Message:

Reordered fields in FunctionDecl? and removed some trailing white-space.

Location:

src/AST

Files:

• Decl.cpp (modified) (4 diffs)
• Decl.hpp (modified) (1 diff)

src/AST/Decl.cpp

@@ -58 +58 @@
         CompoundStmt * stmts, Storage::Classes storage, Linkage::Spec linkage,
         std::vector<ptr<Attribute>>&& attrs, Function::Specs fs, bool isVarArgs)
-: DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), params(std::move(params)), returns(std::move(returns)),
-        type_params(std::move(forall)), stmts( stmts ) {
+: DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ),
+        type_params(std::move(forall)), assertions(),
+        params(std::move(params)), returns(std::move(returns)), stmts( stmts ) {
         FunctionType * ftype = new FunctionType(static_cast<ArgumentFlag>(isVarArgs));
         for (auto & param : this->params) {
@@ -82 +83 @@
         std::vector<ptr<Attribute>>&& attrs, Function::Specs fs, bool isVarArgs)
 : DeclWithType( location, name, storage, linkage, std::move(attrs), fs ),
+                type_params( std::move( forall) ), assertions( std::move( assertions ) ),
                 params( std::move(params) ), returns( std::move(returns) ),
-                type_params( std::move( forall) ), assertions( std::move( assertions ) ),
                 type( nullptr ), stmts( stmts ) {
         FunctionType * type = new FunctionType( (isVarArgs) ? VariableArgs : FixedArgs );
@@ -162 +163 @@
 
         auto it = enumValues.find( enumerator->name );
-        
+
         if ( it != enumValues.end() ) {
-                        
+
                 // Handle typed enum by casting the value in (C++) compiler
                 // if ( base ) { // A typed enum
@@ -179 +180 @@
                 //                      case BasicType::Kind::LongUnsignedInt: value = (long unsigned int) it->second; break;
                 //                      case BasicType::Kind::LongLongSignedInt: value = (long long signed int) it->second; break;
-                //                      case BasicType::Kind::LongLongUnsignedInt: value = (long long unsigned int) it->second; break; 
+                //                      case BasicType::Kind::LongLongUnsignedInt: value = (long long unsigned int) it->second; break;
                 //                      // TODO: value should be able to handle long long unsigned int
 

src/AST/Decl.hpp

@@ -125 +125 @@
 class FunctionDecl : public DeclWithType {
 public:
+        std::vector<ptr<TypeDecl>> type_params;
+        std::vector<ptr<DeclWithType>> assertions;
         std::vector<ptr<DeclWithType>> params;
         std::vector<ptr<DeclWithType>> returns;
-        std::vector<ptr<TypeDecl>> type_params;
-        std::vector<ptr<DeclWithType>> assertions;
         // declared type, derived from parameter declarations
         ptr<FunctionType> type;