Changeset e172f42 for src/AST

Timestamp:

Jun 16, 2023, 9:10:46 AM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

5dbb9f3

Parents:

a0bd9a2 (diff), 62d62db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ast-experimental'

Location:

src/AST

Files:

• Convert.cpp (modified) (1 diff)
• Expr.cpp (modified) (1 diff)
• Expr.hpp (modified) (2 diffs)
• SymbolTable.cpp (modified) (2 diffs)
• Type.hpp (modified) (1 diff)
• TypeEnvironment.cpp (modified) (1 diff)
• TypeEnvironment.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -2343 +2343 @@
                                 old->location,
                                 GET_ACCEPT_1(arg, Expr),
-                                old->isGenerated ? ast::GeneratedCast : ast::ExplicitCast
+                                old->isGenerated ? ast::GeneratedCast : ast::ExplicitCast,
+                                (ast::CastExpr::CastKind) old->kind
                         )
                 );

src/AST/Expr.cpp

@@ -186 +186 @@
 // --- CastExpr
 
-CastExpr::CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g )
-: Expr( loc, new VoidType{} ), arg( a ), isGenerated( g ) {}
+CastExpr::CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g, CastKind kind )
+: Expr( loc, new VoidType{} ), arg( a ), isGenerated( g ), kind( kind ) {}
 
 bool CastExpr::get_lvalue() const {

src/AST/Expr.hpp

@@ -55 +55 @@
                 const Expr * e )
         : decl( id ), declptr( declptr ), actualType( actual ), formalType( formal ), expr( e ) {}
+
+        operator bool() {return declptr;}
 };
 
@@ -335 +337 @@
         GeneratedFlag isGenerated;
 
+        enum CastKind {
+                Default, // C
+                Coerce, // reinterpret cast
+                Return  // overload selection
+        };
+
+        CastKind kind = Default;
+
         CastExpr( const CodeLocation & loc, const Expr * a, const Type * to,
-                GeneratedFlag g = GeneratedCast ) : Expr( loc, to ), arg( a ), isGenerated( g ) {}
+                GeneratedFlag g = GeneratedCast, CastKind kind = Default ) : Expr( loc, to ), arg( a ), isGenerated( g ), kind( kind ) {}
         /// Cast-to-void
-        CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g = GeneratedCast );
+        CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g = GeneratedCast, CastKind kind = Default );
 
         /// Wrap a cast expression around an existing expression (always generated)

src/AST/SymbolTable.cpp

@@ -19 +19 @@
 
 #include "Copy.hpp"
+#include <iostream>
+#include <algorithm>
+
 #include "Decl.hpp"
 #include "Expr.hpp"
@@ -203 +206 @@
                         out.push_back(decl.second);
                 }
+
+                // std::cerr << otypeKey << ' ' << out.size() << std::endl;
         }
 

src/AST/Type.hpp

@@ -451 +451 @@
         bool operator==(const TypeEnvKey & other) const;
         bool operator<(const TypeEnvKey & other) const;
-};
+        operator bool() {return base;}
+};
+
 
 /// tuple type e.g. `[int, char]`

src/AST/TypeEnvironment.cpp

@@ -135 +135 @@
                 }
         }
-        sub.normalize();
+        // sub.normalize();
 }
 

src/AST/TypeEnvironment.hpp

@@ -63 +63 @@
 
                 int cmp = d1->var->name.compare( d2->var->name );
-                return cmp < 0 || ( cmp == 0 && d1->result < d2->result );
+                return cmp > 0 || ( cmp == 0 && d1->result < d2->result );
         }
 };