Changeset 000b914 for src/Parser/ExpressionNode.cc

Timestamp:

Dec 7, 2015, 11:31:53 AM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

baf7fee

Parents:

e58be8e (diff), 47534159 (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 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -586 +586 @@
                 }
           case OperatorNode::AlignOf:
+                {
+                        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()) ) {
+                                return new AlignofExpr( arg->get_decl()->buildType());
+                        } else {
+                                return new AlignofExpr( args.front());
+                        } // if
+                }
           case OperatorNode::SizeOf:
                 {
-///     bool isSizeOf = ( op->get_type() == OperatorNode::SizeOf );
-
                         if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()) ) {
                                 return new SizeofExpr( arg->get_decl()->buildType());