resin 0.2.2 → 0.2.3

data/amber/js/amber.js

@@ -22,9 +22,9 @@ amber = (function() {
     var nocache = '';
 
 	that.toggleIDE = function() {
-		if ($('#jtalk').length == 0) {
+		if ($('#amber').length == 0) {
 			smalltalk.Browser._open();
-		} else if ($('#jtalk').is(':visible')) {
+		} else if ($('#amber').is(':visible')) {
 			smalltalk.TabManager._current()._close();
 		} else {
 			smalltalk.TabManager._current()._open();
@@ -83,10 +83,17 @@ amber = (function() {
 				'Kernel-Transcript',
 				'Kernel-Announcements',
 				'Canvas',
-				'Compiler',
+				'SUnit',
+				'Importer-Exporter',
+				'Compiler-Exceptions',
+				'Compiler-Core',
+				'Compiler-AST',
+				'Compiler-Semantic',
+				'Compiler-IR',
+				'Compiler-Inlining',
+				'Compiler-Tests',
 				'parser',
 				'IDE',
-				'SUnit',
 				'Examples',
 				'Benchfib',
 				'Kernel-Tests'
@@ -149,7 +156,7 @@ amber = (function() {
 
 	function loadDependencies() {
 		if (typeof jQuery == 'undefined') {
-			writeScriptTag(buildJSURL('lib/jQuery/jquery-1.6.4.min.js'));
+			writeScriptTag(buildJSURL('lib/jQuery/jquery-1.8.2.min.js'));
 		}
 
 		if ((typeof jQuery == 'undefined') || (typeof jQuery.ui == 'undefined')) {      
@@ -170,8 +177,9 @@ amber = (function() {
 		window.smalltalkReady = function() {
 			if (spec.ready) {
 				spec.ready();
-			}
-		}
+			};
+            evaluateSmalltalkScripts();
+		};
 
 		loadAllJS(); 
 	};
@@ -217,6 +225,17 @@ amber = (function() {
 		document.write(scriptString);
 	};
 
+    function evaluateSmalltalkScripts() {
+        jQuery(document).ready(function() {
+            jQuery('script[type="text/smalltalk"]').each(function(i, elt) {
+                smalltalk.send(
+                    smalltalk.send(smalltalk.Compiler, '_new'),
+                    '_evaluateExpression_',
+                    [jQuery(elt).html()])
+            });
+        })
+    };
+
 	function populateLocalPackages(){
 		var localStorageRE = /^smalltalk\.packages\.(.*)$/;
 		localPackages = {};

data/amber/js/boot.js

@@ -172,33 +172,33 @@ function Smalltalk(){
 	   metaclasses. */
 	   
 	st.init = function(klass) {
-		st.initSubTree(klass);
+		st.initClass(klass);
 		if(klass.klass && !klass.meta) {
-			st.initSubTree(klass.klass);
+			st.initClass(klass.klass);
 		}
 	};
 
-	st.initSubTree = function(klass) {
+	st.initClass = function(klass) {
 		var subclasses = st.subclasses(klass);
-		var methods, proto = klass.fn.prototype;
+		var methods, prototype = klass.fn.prototype;
 
 		if(klass.superclass && klass.superclass !== nil) {
 			methods = st.methods(klass.superclass);
 
 			//Methods linking
-			for(var keys=Object.keys(methods),i=0,l=keys.length; i<l; ++i) {
-				var k = keys[i]
-				if(!proto.methods[k]) {
-					proto.inheritedMethods[k] = methods[k];
-					Object.defineProperty(proto, methods[k].jsSelector, {
-						value: methods[k].fn, configurable: true // no writable - in par with ES6 methods
+			for(var keys = Object.keys(methods), i=0; i<keys.length; i++) {
+				var key = keys[i];
+				if(!prototype.methods[key]) {
+					prototype.inheritedMethods[key] = methods[key];
+					Object.defineProperty(prototype, methods[key].jsSelector, {
+						value: methods[key].fn, configurable: true, writable: true
 					});
 				}
 			}
 		}
 
-		for(var i=0;i<subclasses.length;i++) {
-			st.initSubTree(subclasses[i]);
+		for(var i=0; i<subclasses.length; i++) {
+			st.initClass(subclasses[i]);
 		}
 	};
 
@@ -218,7 +218,7 @@ function Smalltalk(){
 
 	st.classes = function() {
 		var classes = [], names = Object.keys(st), l = names.length;
-		for (var i=0; i<l; ++i) {
+		for (var i=0; i<l; i++) {
 			var name = names[i];
 			if (name.search(/^[A-Z]/) !== -1) {
 				classes.push(st[name]);
@@ -232,13 +232,13 @@ function Smalltalk(){
 
 	st.methods = function(klass) {
 		var methods = {};
-		var copyFrom = klass.fn.prototype.methods;
-		for(var i=0, k=Object.keys(copyFrom), l=k.length; i<l; ++i) {
-			methods[k[i]] = copyFrom[k[i]];
+		inheritedMethods = klass.fn.prototype.inheritedMethods;
+		for(var i=0, keys=Object.keys(inheritedMethods); i<keys.length; i++) {
+			methods[keys[i]] = inheritedMethods[keys[i]];
 		}
-		copyFrom = klass.fn.prototype.inheritedMethods;
-		for(var i=0, k=Object.keys(copyFrom), l=k.length; i<l; ++i) {
-			methods[k[i]] = copyFrom[k[i]];
+		var inheritedMethods = klass.fn.prototype.methods;
+		for(var i=0, keys=Object.keys(inheritedMethods); i<keys.length; i++) {
+			methods[keys[i]] = inheritedMethods[keys[i]];
 		}
 		return methods;
 	};
@@ -249,8 +249,8 @@ function Smalltalk(){
 	st.subclasses = function(klass) {
 		var subclasses = [];
 		var classes = st.classes();
-		for(var i=0, l=classes.length; i<l; ++i) {
-			var c = classes[i]
+		for(var i=0; i < classes.length; i++) {
+			var c = classes[i];
 			if(c.fn) {
 				//Classes
 				if(c.superclass === klass) {
@@ -304,7 +304,7 @@ function Smalltalk(){
 	};
 
 	/* Add a class to the smalltalk object, creating a new one if needed.
-	   Package is lazily created if it does not exist with given name.*/
+	   A Package is lazily created if it does not exist with given name. */
 
 	st.addClass = function(className, superclass, iVarNames, pkgName) {
 		var pkg = st.addPackage(pkgName);
@@ -326,7 +326,7 @@ function Smalltalk(){
 
 	st.addMethod = function(jsSelector, method, klass) {
 		Object.defineProperty(klass.fn.prototype, jsSelector, {
-			value: method.fn, configurable: true // not writable - in par with ES6 methods
+			value: method.fn, configurable: true, writable: true
 		});
 		klass.fn.prototype.methods[method.selector] = method;
 		method.methodClass = klass;
@@ -353,14 +353,14 @@ function Smalltalk(){
 	};
 
 	function withContextSend(receiver, selector, args, klass) {
-		var call, imp;
+		var call, method;
 		if(receiver == null) {
 			receiver = nil;
 		}
-		imp = klass ? klass.fn.prototype[selector] : receiver.klass && receiver[selector];
-		if(imp) {
-			var context = pushContext(receiver, selector, args);
-			call = imp.apply(receiver, args);
+		method = klass ? klass.fn.prototype[selector] : receiver.klass && receiver[selector];
+		if(method) {
+			var context = pushContext(receiver, selector, method, args);
+			call = method.apply(receiver, args);
 			popContext(context);
 			return call;
 		} else {
@@ -372,8 +372,9 @@ function Smalltalk(){
 	   (See the Smalltalk class ErrorHandler and its subclasses */
 
 	function handleError(error) {
-		st.thisContext = undefined;
-		smalltalk.ErrorHandler._current()._handleError_(error);
+        if(!error.cc) {
+		    smalltalk.ErrorHandler._current()._handleError_(error);
+        }
 	};
 
 	/* Handles #dnu: *and* JavaScript method calls.
@@ -437,21 +438,21 @@ function Smalltalk(){
 	st.getThisContext = function() {
 		if(st.thisContext) {
 			return st.thisContext.copy();
-		}/* else { // this is the default
-			return undefined;
-		}*/
+		}
 	};
 
-	function pushContext(receiver, selector, temps) {
+	function pushContext(receiver, selector, method, temps) {
 		var c = st.oldContext, tc = st.thisContext;
 		if (!c) {
-			return st.thisContext = new SmalltalkMethodContext(receiver, selector, temps, tc);
+			return st.thisContext = new SmalltalkMethodContext(receiver, selector, method, temps, tc);
 		}
 		st.oldContext = null;
 		c.homeContext = tc;
-		c.receiver = receiver;
-		c.selector = selector;
-		c.temps = temps || {};
+        c.pc          = 1;
+		c.receiver    = receiver;
+        c.selector    = selector;
+		c.method      = method;
+		c.temps       = temps || {};
 		return st.thisContext = c;
 	};
 
@@ -510,24 +511,41 @@ function Smalltalk(){
 		}
 		return object;
 	};
+
+    /* Boolean assertion */
+    st.assert = function(boolean) {
+        if(boolean.klass === smalltalk.Boolean) {
+            return boolean;
+        } else {
+            smalltalk.NonBooleanReceiver._new()._object_(boolean)._signal();
+        }
+    }
 };
 
-function SmalltalkMethodContext(receiver, selector, temps, home) {
-	this.receiver = receiver;
-	this.selector = selector;
-	this.temps = temps || {};
+function SmalltalkMethodContext(receiver, selector, method, temps, home) {
+	this.receiver    = receiver;
+    this.selector    = selector;
+	this.method      = method;
+	this.temps       = temps || {};
 	this.homeContext = home;
+
+    this.resume = function() {
+        //Brutally set the receiver as thisContext, then re-enter the function
+        smalltalk.thisContext = this;
+        return this.method.apply(receiver, temps);
+    };
 };
 
 SmalltalkMethodContext.prototype.copy = function() {
 	var home = this.homeContext;
 	if(home) {home = home.copy()}
 	return new SmalltalkMethodContext(
-			this.receiver, 
-			this.selector, 
-			this.temps, 
-			home
-			);
+		this.receiver, 
+        this.selector,
+		this.method, 
+		this.temps, 
+		home
+	);
 };
 
 /* Global Smalltalk objects. */

data/amber/js/init.js

@@ -1,4 +1,4 @@
-smalltalk.initSubTree(smalltalk.Object); //metaclasses are in through Class
+smalltalk.init(smalltalk.Object); //metaclasses are in through Class
 smalltalk.classes()._do_(function(each) {
 	each._initialize()});
 

data/amber/js/lib/CodeMirror/amber.css

@@ -1,21 +1,21 @@
-.cm-s-jtalk span.cm-keyword {color: #7F0000; font-weight: bold;}
-.cm-s-jtalk span.cm-className {font-weight: bold;}
-.cm-s-jtalk span.cm-assignment {font-weight: bold;}
-.cm-s-jtalk span.cm-return {font-weight: bold;}
-.cm-s-jtalk span.cm-atom {color: #219;}
-.cm-s-jtalk span.cm-number {color: #7F0000;}
-.cm-s-jtalk span.cm-def {color: #00f;}
-.cm-s-jtalk span.cm-variable {color: grey;}
-.cm-s-jtalk span.cm-variable-2 {color: #05a;}
-.cm-s-jtalk span.cm-variable-3 {color: #0a5;}
-.cm-s-jtalk span.cm-property {color: black;}
-.cm-s-jtalk span.cm-operator {color: #00007F;}
-.cm-s-jtalk span.cm-comment {color: #007F00;}
-.cm-s-jtalk span.cm-string {color: #7F007F;}
-.cm-s-jtalk span.cm-meta {color: #555;}
-.cm-s-jtalk span.cm-error {color: #f00;}
-.cm-s-jtalk span.cm-qualifier {color: #555;}
-.cm-s-jtalk span.cm-builtin {color: #30a;}
-.cm-s-jtalk span.cm-bracket {color: #cc7;}
-.cm-s-jtalk span.cm-tag {color: #170;}
-.cm-s-jtalk span.cm-attribute {color: #00c;}
+.cm-s-amber span.cm-keyword {color: #7F0000; font-weight: bold;}
+.cm-s-amber span.cm-className {font-weight: bold;}
+.cm-s-amber span.cm-assignment {font-weight: bold;}
+.cm-s-amber span.cm-return {font-weight: bold;}
+.cm-s-amber span.cm-atom {color: #219;}
+.cm-s-amber span.cm-number {color: #7F0000;}
+.cm-s-amber span.cm-def {color: #00f;}
+.cm-s-amber span.cm-variable {color: grey;}
+.cm-s-amber span.cm-variable-2 {color: #05a;}
+.cm-s-amber span.cm-variable-3 {color: #0a5;}
+.cm-s-amber span.cm-property {color: black;}
+.cm-s-amber span.cm-operator {color: #00007F;}
+.cm-s-amber span.cm-comment {color: #007F00;}
+.cm-s-amber span.cm-string {color: #7F007F;}
+.cm-s-amber span.cm-meta {color: #555;}
+.cm-s-amber span.cm-error {color: #f00;}
+.cm-s-amber span.cm-qualifier {color: #555;}
+.cm-s-amber span.cm-builtin {color: #30a;}
+.cm-s-amber span.cm-bracket {color: #cc7;}
+.cm-s-amber span.cm-tag {color: #170;}
+.cm-s-amber span.cm-attribute {color: #00c;}

data/amber/js/lib/CodeMirror/codemirror.css

@@ -1,6 +1,11 @@
 .CodeMirror {
   line-height: 1em;
   font-family: monospace;
+
+  /* Necessary so the scrollbar can be absolutely positioned within the wrapper on Lion. */
+  position: relative;
+  /* This prevents unwanted scrollbars from showing up on the body and wrapper in IE. */
+  overflow: hidden;
 }
 
 .CodeMirror-scroll {
@@ -9,10 +14,41 @@
   /* This is needed to prevent an IE[67] bug where the scrolled content
      is visible outside of the scrolling box. */
   position: relative;
+  outline: none;
+}
+
+/* Vertical scrollbar */
+.CodeMirror-scrollbar {
+  position: absolute;
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+  z-index: 5;
+}
+.CodeMirror-scrollbar-inner {
+  /* This needs to have a nonzero width in order for the scrollbar to appear
+     in Firefox and IE9. */
+  width: 1px;
+}
+.CodeMirror-scrollbar.cm-sb-overlap {
+  /* Ensure that the scrollbar appears in Lion, and that it overlaps the content
+     rather than sitting to the right of it. */
+  position: absolute;
+  z-index: 1;
+  float: none;
+  right: 0;
+  min-width: 12px;
+}
+.CodeMirror-scrollbar.cm-sb-nonoverlap {
+  min-width: 12px;
+}
+.CodeMirror-scrollbar.cm-sb-ie7 {
+  min-width: 18px;
 }
 
 .CodeMirror-gutter {
   position: absolute; left: 0; top: 0;
+  z-index: 10;
   background-color: #f7f7f7;
   border-right: 1px solid #eee;
   min-width: 2em;
@@ -22,9 +58,13 @@
   color: #aaa;
   text-align: right;
   padding: .4em .2em .4em .4em;
+  white-space: pre !important;
+  cursor: default;
 }
 .CodeMirror-lines {
   padding: .4em;
+  white-space: pre;
+  cursor: text;
 }
 
 .CodeMirror pre {
@@ -38,30 +78,96 @@
   padding: 0; margin: 0;
   white-space: pre;
   word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+}
+
+.CodeMirror-wrap pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+  overflow-x: hidden;
 }
 
 .CodeMirror textarea {
-  font-family: inherit !important;
-  font-size: inherit !important;
+  outline: none !important;
 }
 
-.CodeMirror-cursor {
+.CodeMirror pre.CodeMirror-cursor {
   z-index: 10;
   position: absolute;
   visibility: hidden;
-  border-left: 1px solid black !important;
+  border-left: 1px solid black;
+  border-right: none;
+  width: 0;
+}
+.cm-keymap-fat-cursor pre.CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: transparent;
+  background: rgba(0, 200, 0, .4);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
 }
-.CodeMirror-focused .CodeMirror-cursor {
+/* Kludge to turn off filter in ie9+, which also accepts rgba */
+.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+.CodeMirror-focused pre.CodeMirror-cursor {
   visibility: visible;
 }
 
-span.CodeMirror-selected {
-  background: #ccc !important;
-  color: HighlightText !important;
-}
-.CodeMirror-focused span.CodeMirror-selected {
-  background: Highlight !important;
+div.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
+
+.CodeMirror-searching {
+  background: #ffa;
+  background: rgba(255, 255, 0, .4);
 }
 
-.CodeMirror-matchingbracket {color: #0f0 !important;}
-.CodeMirror-nonmatchingbracket {color: #f22 !important;}
+/* Default theme */
+
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.cm-s-default span.cm-bracket {color: #997;}
+.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}
+.cm-s-default span.cm-header {color: blue;}
+.cm-s-default span.cm-quote {color: #090;}
+.cm-s-default span.cm-hr {color: #999;}
+.cm-s-default span.cm-link {color: #00c;}
+
+span.cm-header, span.cm-strong {font-weight: bold;}
+span.cm-em {font-style: italic;}
+span.cm-emstrong {font-style: italic; font-weight: bold;}
+span.cm-link {text-decoration: underline;}
+
+span.cm-invalidchar {color: #f00;}
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+
+@media print {
+
+  /* Hide the cursor when printing */
+  .CodeMirror pre.CodeMirror-cursor {
+    visibility: hidden;
+  }
+
+}