Changeset 80cdb2f for doc/generic_types/evaluation/cfa-stack.c

Timestamp:

Apr 5, 2017, 9:05:36 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

2264c11

Parents:

2f0a3599 (diff), 5671b8d (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:

fix merge conflict

File:

• doc/generic_types/evaluation/cfa-stack.c (modified) (2 diffs)

doc/generic_types/evaluation/cfa-stack.c

@@ -8 +8 @@
 
 forall(otype T) void ?{}(stack(T)* s) {
-        ?{}( s->head, 0 );
+        ?{}( &s->head, 0 );
 }
 
@@ -25 +25 @@
 
 forall(otype T) void push(stack(T)* s, T value) {
-        s->head = new( value, s->head );
+        s->head = ((stack_node(T)*)malloc()){ value, s->head };
 }