Changeset 4789f44 for src/Parser

Timestamp:

Feb 5, 2016, 12:28:21 PM (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:

408d460, bd85400

Parents:

b4cd03b7 (diff), 2a4b088 (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' into fix-argument-passing-type-warnings

File:

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

src/Parser/ExpressionNode.cc

@@ -606 +606 @@
           case OperatorNode::OffsetOf:
                 {
-                        assert( false );
+                        assert( args.size() == 2 );
+                        
+                        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args() ) ) {
+                                NameExpr *member = dynamic_cast<NameExpr *>( args.back() );
+                                assert( member != 0 );
+
+                                return new UntypedOffsetofExpr( arg->get_decl()->buildType(), member->get_name() );
+                        } else assert( false );
                 }
           case OperatorNode::Attr: