Browse Source

Merge pull request #970 from seandenigris/Issue969

Issue #969
Nicolas Petton 10 years ago
parent
commit
473af433a4
3 changed files with 5 additions and 7 deletions
  1. 3 2
      CONTRIBUTING.md
  2. 2 4
      src/Compiler-Exceptions.js
  3. 0 1
      src/Compiler-Exceptions.st

+ 3 - 2
CONTRIBUTING.md

@@ -61,8 +61,9 @@ Setup your Amber clone
 
 1. Create a fork of the repository on GitHub
 2. Clone the repository
-3. Run ```npm install```
-4. Run ```bower install``` (requires bower to be installed via ```npm install -g bower```)
+3. Run ```npm install``` to install dependencies listed in package.json (See [here](https://www.npmjs.org/doc/cli/npm-install.html for more info) for more info)
+4. Run ```bower install``` to install dependencies listed in bower.json (See [here](http://bower.io/) for more info)
+  - requires bower to be installed via ```npm install -g bower```
 5. Run ```${Amber_DIR}/bin/amber serve```
 
 Now you should be able to commit changes to your computer.

+ 2 - 4
src/Compiler-Exceptions.js

@@ -207,13 +207,11 @@ protocol: 'error handling',
 fn: function (anError){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-($ctx1.supercall = true, globals.RethrowErrorHandler.superclass.fn.prototype._handleError_.apply(_st(self), [anError]));
-$ctx1.supercall = false;
 self._basicSignal_(anError);
 return self}, function($ctx1) {$ctx1.fill(self,"handleError:",{anError:anError},globals.RethrowErrorHandler)})},
 args: ["anError"],
-source: "handleError: anError\x0a        super handleError: anError.\x0a        self basicSignal: anError",
-messageSends: ["handleError:", "basicSignal:"],
+source: "handleError: anError\x0a        self basicSignal: anError",
+messageSends: ["basicSignal:"],
 referencedClasses: []
 }),
 globals.RethrowErrorHandler);

+ 0 - 1
src/Compiler-Exceptions.st

@@ -104,7 +104,6 @@ basicSignal: anError
 !
 
 handleError: anError
-        super handleError: anError.
         self basicSignal: anError
 ! !