Reset now clears the stack

Author: craftybones

src/machine.js

@@ -5,14 +5,15 @@ const Lines = require('./lines.js');
 
 class Machine {
  constructor() {
- this._reset();
  this.lines = new Lines();
  this.stack = new Stack();
+ this._reset();
  }
 
  _reset() {
  this._resetRegisters();
  this._resetFlags();
+ this.stack.clear();
  this.prn = [];
  this.table = [];
  }

src/stack.js

@@ -8,15 +8,15 @@ class Stack {
  * @constructor
  */
  constructor() {
- this.stack = [];
+ this._stack = [];
  }
 
  /**
  * Pushes the given value onto the stack
  * @param {number} value - The value to be pushed onto a stack.
  */
  push(value) {
- this.stack.push(value);
+ this._stack.push(value);
  }
 
  /**
@@ -25,16 +25,20 @@ class Stack {
  * @throws {StackUnderflowException} Will throw an error if you try to pop an empty stack
  */
  pop() {
- if (this.stack.length == 0) throw new StackUnderflowException();
- return this.stack.pop();
+ if (this._stack.length == 0) throw new StackUnderflowException();
+ return this._stack.pop();
  }
 
  /**
  * Returns an array representation of the stack
  * @returns {number[]} The stack represented as an array with the last number pushed at the tail of the array and the first number pushed at the head of the array.
  */
  asArray() {
- return this.stack.map(a => a);
+ return this._stack.map(a => a);
+ }
+
+ clear() {
+ this._stack = [];
  }
 }
 

test/testMachine.js

@@ -118,8 +118,19 @@ describe('Machine with stack', () => {
  assert.throws(() => machine.execute());
  });
 
- it.skip('should clear the stack between multiple executions', () => {
- // Code
+ it('should clear the stack between multiple executions', () => {
+ const machine = new Machine();
+ const program = [
+ '10 START',
+ '20 MOV A, 5',
+ '30 PUSH A',
+ '40 STOP'
+ ];
+ machine.load(stitch(program));
+ machine.execute();
+ assert.deepEqual([5],machine.getStack());
+ machine.execute();
+ assert.deepEqual([5],machine.getStack());
  });
 });
 

test/testStack.js

@@ -35,4 +35,12 @@ describe('Stack ', () => {
  let stack = new Stack();
  assert.throws(() => stack.pop());
  });
+
+ it('should clear the stack',() => {
+ let stack = new Stack();
+ stack.push(5);
+ assert.deepEqual([5], stack.asArray());
+ stack.clear();
+ assert.deepEqual([], stack.asArray());
+ });
 });