Changeset 7e4b44db

Timestamp:

Mar 22, 2018, 1:20:29 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

bd06384

Parents:

8d7bef2

Message:

Make Constant no longer BaseSyntaxNode?

Location:

src

Files:

• Common/GC.cc (modified) (2 diffs)
• Common/PassVisitor.h (modified) (2 diffs)
• SynTree/Constant.h (modified) (1 diff)

src/Common/GC.cc

@@ -17 +17 @@
 
 #include <algorithm>
+#include <cassert>
 
 GC& GC::get() {
@@ -101 +102 @@
 }
 
+bool stack_check( int* i, GC_Object* o ) {
+        int j;
+        return ( i < &j ) == ( (void*)o < (void*)&j );
+}
+
 GC_Object::GC_Object() {
         GC::get().register_object( this );
+
+        int i;
+        assert(!stack_check(&i, this));
 }
 

src/Common/PassVisitor.h

@@ -148 +148 @@
         virtual void visit( Subrange * subrange ) override final;
 
-        virtual void visit( Constant * constant ) override final;
+        virtual void visit( Constant * constant ) final;
 
         virtual void visit( Attribute * attribute ) override final;
@@ -245 +245 @@
         virtual Subrange * mutate( Subrange * subrange ) override final;
 
-        virtual Constant * mutate( Constant * constant ) override final;
+        virtual Constant * mutate( Constant * constant ) final;
 
         virtual Attribute * mutate( Attribute * attribute ) override final;

src/SynTree/Constant.h

@@ -19 +19 @@
 #include <string>     // for string
 
-#include "BaseSyntaxNode.h"
 #include "Mutator.h"  // for Mutator
 #include "Visitor.h"  // for Visitor
 
+#include "Common/Indenter.h"  // for Indenter
+
 class Type;
 
-class Constant : public BaseSyntaxNode {
+class Constant {
   public:
         Constant( Type * type, std::string rep, unsigned long long val );