Changeset 860f19f

Timestamp:

Mar 9, 2018, 2:28:09 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

200b2b5, e2c70ab

Parents:

e84382b

Message:

Clean up code edits

Location:

doc/papers/general

Files:

• Paper.tex (modified) (3 diffs)
• evaluation/c-stack.c (modified) (1 diff)
• evaluation/cpp-stack.hpp (modified) (1 diff)
• evaluation/cpp-vstack.cpp (modified) (2 diffs)
• evaluation/cpp-vstack.hpp (modified) (1 diff)
• evaluation/timing.xlsx (modified) (previous)

doc/papers/general/Paper.tex

@@ -2637 +2637 @@
                                                                         & \CT{C}        & \CT{\CFA}     & \CT{\CC}      & \CT{\CCV}             \\ \hline
 maximum memory usage (MB)                       & 10,001        & 2,502         & 2,503         & 11,253                \\
-source code size (lines)                        & 197           & 186           & 125           & 293                   \\
+source code size (lines)                        & 196           & 186           & 125           & 290                   \\
 redundant type annotations (lines)      & 27            & 0                     & 2                     & 16                    \\
 binary size (KB)                                        & 14            & 257           & 14            & 37                    \\
@@ -2843 +2843 @@
 }
 _Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
-void push_stack( struct stack * s, void * value ) {
+void push_stack( struct stack * s, void * v ) {
         struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
-        *n = (struct stack_node){ value, s->head }; /***/
+        *n = (struct stack_node){ v, s->head }; /***/
         s->head = n;
 }
@@ -2968 +2968 @@
         node * head;
         stack() : head( nullptr ) {}
-        stack( const stack<T> & o) { copy( o ); }
-        stack( stack<T> && o ) : head( o.head ) { o.head = nullptr; }
+        stack( const stack<T> & o ) { copy( o ); }
         void clear() {
                 for ( node * next = head; next; ) {

doc/papers/general/evaluation/c-stack.c

@@ -38 +38 @@
 _Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
 
-void push_stack( struct stack * s, void * value ) {
+void push_stack( struct stack * s, void * v ) {
         struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
-        *n = (struct stack_node){ value, s->head }; /***/
+        *n = (struct stack_node){ v, s->head }; /***/
         s->head = n;
 }

doc/papers/general/evaluation/cpp-stack.hpp

@@ -12 +12 @@
         stack() : head( nullptr ) {}
         stack( const stack<T> & o ) { copy( o ); }
-        stack( stack<T> && o ) : head( o.head ) { o.head = nullptr; }
 
         void clear() {

doc/papers/general/evaluation/cpp-vstack.cpp

@@ -24 +24 @@
 stack::stack() : head( nullptr ) {}
 stack::stack( const stack & o ) { copy( o ); }
-stack::stack( stack && o ) : head( o.head ) { o.head = nullptr; }
 stack::~stack() { clear(); }
 
@@ -31 +30 @@
         clear();
         copy( o );
-        return *this;
-}
-
-stack & stack::operator=( stack && o ) {
-        if ( this == &o ) return *this;
-        head = o.head;
-        o.head = nullptr;
         return *this;
 }

doc/papers/general/evaluation/cpp-vstack.hpp

@@ -15 +15 @@
         stack();
         stack( const stack & o );
-        stack( stack && o );
         ~stack();
         stack & operator=( const stack& o );
-        stack & operator=( stack && o );
         bool empty() const;
         void push( const object & value );