Changeset 9d23c2d

Timestamp:

May 22, 2019, 1:03:56 PM (6 years ago)

Author:

Michael Brooks <mlbrooks@…>

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:

15934a6

Parents:

20de6fb (diff), 3f840e3 (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:

finished draft conversion for expressions

Location:

src

Files:

• AST/Bitfield.hpp (modified) (1 diff)
• AST/Node.cpp (modified) (2 diffs)
• AST/Print.cpp (added)
• AST/Print.hpp (added)
• AST/module.mk (modified) (1 diff)
• Makefile.in (modified) (4 diffs)

src/AST/Bitfield.hpp

@@ -57 +57 @@
 };
 
-/// Adds default printing operator to a bitfield type.
-/// Include in definition to add print function, requires other bitfield operators.
-/// @param N  Number of bits in bitfield
-#define MakeBitfieldPrint( N ) \
-        static const char* Names[]; \
- \
-        void print( std::ostream & os ) const { \
-                if ( (*this).any() ) { \
-                        for ( unsigned int i = 0; i < N; i += 1 ) { \
-                                if ( (*this)[i] ) { \
-                                        os << Names[i] << ' '; \
-                                } \
-                        } \
-                } \
-        }
+template<typename T>
+inline bool operator== ( const bitfield<T> & a, const bitfield<T> & b ) {
+        return a.val == b.val;
+}
+
+template<typename T>
+inline bool operator!= ( const bitfield<T> & a, const bitfield<T> & b ) {
+        return !(a == b);
+}
 
 // Local Variables: //

src/AST/Node.cpp

@@ -26 +26 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
+
+#include "Print.hpp"
 
 template< typename node_t, enum ast::Node::ref_type ref_t >
@@ -47 +49 @@
 
 std::ostream & ast::operator<< ( std::ostream & out, const ast::Node * node ) {
-        (void)node;
-        #warning unimplemented
-        assertf(false, "Unimplemented");
+        print(out, node);
         return out;
 }

src/AST/module.mk

@@ -24 +24 @@
         AST/LinkageSpec.cpp \
         AST/Node.cpp \
+        AST/Print.cpp \
         AST/Stmt.cpp \
         AST/Type.cpp \

src/Makefile.in

@@ -169 +169 @@
         AST/Expr.$(OBJEXT) AST/Init.$(OBJEXT) \
         AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
-        AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \
+        AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \
         AST/TypeSubstitution.$(OBJEXT)
 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
@@ -577 +577 @@
         AST/LinkageSpec.cpp \
         AST/Node.cpp \
+        AST/Print.cpp \
         AST/Stmt.cpp \
         AST/Type.cpp \
@@ -741 +742 @@
         AST/$(DEPDIR)/$(am__dirstamp)
 AST/Node.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/Print.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
 AST/Stmt.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
 AST/Type.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
@@ -1172 +1174 @@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/LinkageSpec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Print.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Stmt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Type.Po@am__quote@