resin 0.0.1 → 0.0.2

data/amber/js/boot.js

@@ -48,9 +48,9 @@ if (typeof console === "undefined") {
 
 /* Smalltalk constructors definition */
 
-function SmalltalkObject(){};
+function SmalltalkObject(){}
 function SmalltalkBehavior(){};
-function SmalltalkClass(){};
+function SmalltalkClass(){}
 function SmalltalkPackage(){};
 function SmalltalkMetaclass(){
 	this.meta = true;
@@ -133,6 +133,7 @@ function Smalltalk(){
 		that.fn = spec.fn || function(){};
 		that.superclass = spec.superclass;
 		that.iVarNames = spec.iVarNames || [];
+        that.toString = function() {return 'Smalltalk ' + that.className};
 		if(that.superclass) {
 			that.klass.superclass = that.superclass.klass;
 		}
@@ -246,7 +247,7 @@ function Smalltalk(){
 	/* Create a new class wrapping a JavaScript constructor, and add it to the 
 	   global smalltalk object. Package is lazily created if it does not exist with given name. */
 
-	st.mapClassName = function(className, pkgName, fn, superclass) {
+	st.wrapClassName = function(className, pkgName, fn, superclass) {
 		var pkg = st.addPackage(pkgName);
 		st[className] = klass({
 			className:  className, 
@@ -256,6 +257,11 @@ function Smalltalk(){
 		});
 	};
 
+    /* Create an alias for an existing class */
+    st.alias = function(klass, alias) {
+        st[alias] = klass;
+    }
+
 	/* Add a package to the smalltalk.packages object, creating a new one if needed.
 	   If pkgName is null or empty we return nil, which is an allowed package for a class.
 	   If package already exists we still update the properties of it. */
@@ -390,6 +396,10 @@ function Smalltalk(){
 	/* Call a method of a JS object, or answer a property if it exists.
 	   Else try wrapping a JSObjectProxy around the receiver.
 
+       If the object property is a function, then call it, except if it starts with
+       an uppercase character (we probably want to answer the function itself in this 
+       case and send it #new from Amber).
+
 	   Converts keyword-based selectors by using the first
 	   keyword only, but keeping all message arguments.
 
@@ -399,14 +409,14 @@ function Smalltalk(){
 	function callJavaScriptMethod(receiver, selector, args) {
 		var jsSelector = selector._asJavaScriptSelector();
 		var jsProperty = receiver[jsSelector];
-		if(typeof jsProperty === "function") {
+		if(typeof jsProperty === "function" && !/^[A-Z]/.test(jsSelector)) {
 			return jsProperty.apply(receiver, args);
 		} else if(jsProperty !== undefined) {
 			if(args[0]) {
 				receiver[jsSelector] = args[0];
 				return nil;
 			} else {
-				return jsProperty
+				return jsProperty;
 			}
 		}
 
@@ -556,32 +566,37 @@ if(this.jQuery) {
 /****************************************************************************************/
 
 
-/* Base classes mapping. If you edit this part, do not forget to set the superclass of the
+/* Base classes wrapping. If you edit this part, do not forget to set the superclass of the
    object metaclass to Class after the definition of Object */
 
-smalltalk.mapClassName("Object", "Kernel", SmalltalkObject);
-smalltalk.mapClassName("Smalltalk", "Kernel", Smalltalk, smalltalk.Object);
-smalltalk.mapClassName("Package", "Kernel", SmalltalkPackage, smalltalk.Object);
-smalltalk.mapClassName("Behavior", "Kernel", SmalltalkBehavior, smalltalk.Object);
-smalltalk.mapClassName("Class", "Kernel", SmalltalkClass, smalltalk.Behavior);
-smalltalk.mapClassName("Metaclass", "Kernel", SmalltalkMetaclass, smalltalk.Behavior);
-smalltalk.mapClassName("CompiledMethod", "Kernel", SmalltalkMethod, smalltalk.Object);
+smalltalk.wrapClassName("Object", "Kernel", SmalltalkObject);
+smalltalk.wrapClassName("Smalltalk", "Kernel", Smalltalk, smalltalk.Object);
+smalltalk.wrapClassName("Package", "Kernel", SmalltalkPackage, smalltalk.Object);
+smalltalk.wrapClassName("Behavior", "Kernel", SmalltalkBehavior, smalltalk.Object);
+smalltalk.wrapClassName("Class", "Kernel", SmalltalkClass, smalltalk.Behavior);
+smalltalk.wrapClassName("Metaclass", "Kernel", SmalltalkMetaclass, smalltalk.Behavior);
+smalltalk.wrapClassName("CompiledMethod", "Kernel", SmalltalkMethod, smalltalk.Object);
 
 smalltalk.Object.klass.superclass = smalltalk.Class;
 
-smalltalk.mapClassName("Number", "Kernel", Number, smalltalk.Object);
-smalltalk.mapClassName("BlockClosure", "Kernel", Function, smalltalk.Object);
-smalltalk.mapClassName("Boolean", "Kernel", Boolean, smalltalk.Object);
-smalltalk.mapClassName("Date", "Kernel", Date, smalltalk.Object);
-smalltalk.mapClassName("UndefinedObject", "Kernel", SmalltalkNil, smalltalk.Object);
-
-smalltalk.mapClassName("Collection", "Kernel", null, smalltalk.Object);
-smalltalk.mapClassName("SequenceableCollection", "Kernel", null, smalltalk.Collection);
-smalltalk.mapClassName("CharacterArray", "Kernel", null, smalltalk.SequenceableCollection);
-smalltalk.mapClassName("String", "Kernel", String, smalltalk.CharacterArray);
-smalltalk.mapClassName("Symbol", "Kernel", SmalltalkSymbol, smalltalk.CharacterArray);
-smalltalk.mapClassName("Array", "Kernel", Array, smalltalk.SequenceableCollection);
-smalltalk.mapClassName("RegularExpression", "Kernel", RegExp, smalltalk.String);
-
-smalltalk.mapClassName("Error", "Kernel", Error, smalltalk.Object);
-smalltalk.mapClassName("MethodContext", "Kernel", SmalltalkMethodContext, smalltalk.Object);
+smalltalk.wrapClassName("Number", "Kernel", Number, smalltalk.Object);
+smalltalk.wrapClassName("BlockClosure", "Kernel", Function, smalltalk.Object);
+smalltalk.wrapClassName("Boolean", "Kernel", Boolean, smalltalk.Object);
+smalltalk.wrapClassName("Date", "Kernel", Date, smalltalk.Object);
+smalltalk.wrapClassName("UndefinedObject", "Kernel", SmalltalkNil, smalltalk.Object);
+
+smalltalk.wrapClassName("Collection", "Kernel", null, smalltalk.Object);
+smalltalk.wrapClassName("SequenceableCollection", "Kernel", null, smalltalk.Collection);
+smalltalk.wrapClassName("CharacterArray", "Kernel", null, smalltalk.SequenceableCollection);
+smalltalk.wrapClassName("String", "Kernel", String, smalltalk.CharacterArray);
+smalltalk.wrapClassName("Symbol", "Kernel", SmalltalkSymbol, smalltalk.CharacterArray);
+smalltalk.wrapClassName("Array", "Kernel", Array, smalltalk.SequenceableCollection);
+smalltalk.wrapClassName("RegularExpression", "Kernel", RegExp, smalltalk.String);
+
+smalltalk.wrapClassName("Error", "Kernel", Error, smalltalk.Object);
+smalltalk.wrapClassName("MethodContext", "Kernel", SmalltalkMethodContext, smalltalk.Object);
+
+/* Alias definitions */
+
+smalltalk.alias(smalltalk.Array, "OrderedCollection");
+smalltalk.alias(smalltalk.Date, "Time");

data/amber/js/parser.js

@@ -56,6 +56,7 @@ smalltalk.parser = (function(){
         "unaryPattern": parse_unaryPattern,
         "unarySend": parse_unarySend,
         "unaryTail": parse_unaryTail,
+        "varIdentifier": parse_varIdentifier,
         "variable": parse_variable,
         "ws": parse_ws
       };
@@ -368,6 +369,78 @@ smalltalk.parser = (function(){
         }
         
         
+        var savedPos0 = pos;
+        var savedPos1 = pos;
+        if (input.substr(pos).match(/^[a-zA-Z]/) !== null) {
+          var result3 = input.charAt(pos);
+          pos++;
+        } else {
+          var result3 = null;
+          if (reportMatchFailures) {
+            matchFailed("[a-zA-Z]");
+          }
+        }
+        if (result3 !== null) {
+          var result4 = [];
+          if (input.substr(pos).match(/^[a-zA-Z0-9]/) !== null) {
+            var result5 = input.charAt(pos);
+            pos++;
+          } else {
+            var result5 = null;
+            if (reportMatchFailures) {
+              matchFailed("[a-zA-Z0-9]");
+            }
+          }
+          while (result5 !== null) {
+            result4.push(result5);
+            if (input.substr(pos).match(/^[a-zA-Z0-9]/) !== null) {
+              var result5 = input.charAt(pos);
+              pos++;
+            } else {
+              var result5 = null;
+              if (reportMatchFailures) {
+                matchFailed("[a-zA-Z0-9]");
+              }
+            }
+          }
+          if (result4 !== null) {
+            var result1 = [result3, result4];
+          } else {
+            var result1 = null;
+            pos = savedPos1;
+          }
+        } else {
+          var result1 = null;
+          pos = savedPos1;
+        }
+        var result2 = result1 !== null
+          ? (function(first, others) {return first + others.join("")})(result1[0], result1[1])
+          : null;
+        if (result2 !== null) {
+          var result0 = result2;
+        } else {
+          var result0 = null;
+          pos = savedPos0;
+        }
+        
+        
+        
+        cache[cacheKey] = {
+          nextPos: pos,
+          result:  result0
+        };
+        return result0;
+      }
+      
+      function parse_varIdentifier() {
+        var cacheKey = 'varIdentifier@' + pos;
+        var cachedResult = cache[cacheKey];
+        if (cachedResult) {
+          pos = cachedResult.nextPos;
+          return cachedResult.result;
+        }
+        
+        
         var savedPos0 = pos;
         var savedPos1 = pos;
         if (input.substr(pos).match(/^[a-z]/) !== null) {
@@ -721,25 +794,119 @@ smalltalk.parser = (function(){
         }
         if (result3 !== null) {
           var result4 = [];
-          if (input.substr(pos).match(/^[a-zA-Z0-9]/) !== null) {
-            var result5 = input.charAt(pos);
+          var savedPos3 = pos;
+          if (input.substr(pos).match(/^[a-zA-Z0-9:]/) !== null) {
+            var result12 = input.charAt(pos);
             pos++;
           } else {
-            var result5 = null;
+            var result12 = null;
             if (reportMatchFailures) {
-              matchFailed("[a-zA-Z0-9]");
+              matchFailed("[a-zA-Z0-9:]");
             }
           }
+          if (result12 !== null) {
+            var result10 = [];
+            while (result12 !== null) {
+              result10.push(result12);
+              if (input.substr(pos).match(/^[a-zA-Z0-9:]/) !== null) {
+                var result12 = input.charAt(pos);
+                pos++;
+              } else {
+                var result12 = null;
+                if (reportMatchFailures) {
+                  matchFailed("[a-zA-Z0-9:]");
+                }
+              }
+            }
+          } else {
+            var result10 = null;
+          }
+          var result11 = result10 !== null
+            ? (function(digits) {return digits.join("")})(result10)
+            : null;
+          if (result11 !== null) {
+            var result9 = result11;
+          } else {
+            var result9 = null;
+            pos = savedPos3;
+          }
+          if (result9 !== null) {
+            var result5 = result9;
+          } else {
+            var savedPos2 = pos;
+            var result7 = parse_string();
+            var result8 = result7 !== null
+              ? (function(node) {return node._value()})(result7)
+              : null;
+            if (result8 !== null) {
+              var result6 = result8;
+            } else {
+              var result6 = null;
+              pos = savedPos2;
+            }
+            if (result6 !== null) {
+              var result5 = result6;
+            } else {
+              var result5 = null;;
+            };
+          }
           while (result5 !== null) {
             result4.push(result5);
-            if (input.substr(pos).match(/^[a-zA-Z0-9]/) !== null) {
-              var result5 = input.charAt(pos);
+            var savedPos3 = pos;
+            if (input.substr(pos).match(/^[a-zA-Z0-9:]/) !== null) {
+              var result12 = input.charAt(pos);
               pos++;
             } else {
-              var result5 = null;
+              var result12 = null;
               if (reportMatchFailures) {
-                matchFailed("[a-zA-Z0-9]");
+                matchFailed("[a-zA-Z0-9:]");
+              }
+            }
+            if (result12 !== null) {
+              var result10 = [];
+              while (result12 !== null) {
+                result10.push(result12);
+                if (input.substr(pos).match(/^[a-zA-Z0-9:]/) !== null) {
+                  var result12 = input.charAt(pos);
+                  pos++;
+                } else {
+                  var result12 = null;
+                  if (reportMatchFailures) {
+                    matchFailed("[a-zA-Z0-9:]");
+                  }
+                }
               }
+            } else {
+              var result10 = null;
+            }
+            var result11 = result10 !== null
+              ? (function(digits) {return digits.join("")})(result10)
+              : null;
+            if (result11 !== null) {
+              var result9 = result11;
+            } else {
+              var result9 = null;
+              pos = savedPos3;
+            }
+            if (result9 !== null) {
+              var result5 = result9;
+            } else {
+              var savedPos2 = pos;
+              var result7 = parse_string();
+              var result8 = result7 !== null
+                ? (function(node) {return node._value()})(result7)
+                : null;
+              if (result8 !== null) {
+                var result6 = result8;
+              } else {
+                var result6 = null;
+                pos = savedPos2;
+              }
+              if (result6 !== null) {
+                var result5 = result6;
+              } else {
+                var result5 = null;;
+              };
             }
           }
           if (result4 !== null) {
@@ -754,8 +921,8 @@ smalltalk.parser = (function(){
         }
         var result2 = result1 !== null
           ? (function(val) {
-          		  return smalltalk.ValueNode._new()
-                         	   	._value_(smalltalk.symbolFor(val.join("").replace(/\"/ig, '"')))
+          		  		    return smalltalk.ValueNode._new()
+                         	   		    	   ._value_(smalltalk.symbolFor(val.join("").replace(/\"/ig, '"')))
                          	 })(result1[1])
           : null;
         if (result2 !== null) {
@@ -829,17 +996,42 @@ smalltalk.parser = (function(){
         var savedPos0 = pos;
         var savedPos1 = pos;
         if (input.substr(pos).match(/^[\-]/) !== null) {
-          var result7 = input.charAt(pos);
+          var result9 = input.charAt(pos);
           pos++;
         } else {
-          var result7 = null;
+          var result9 = null;
           if (reportMatchFailures) {
             matchFailed("[\\-]");
           }
         }
-        var result3 = result7 !== null ? result7 : '';
+        var result3 = result9 !== null ? result9 : '';
         if (result3 !== null) {
-          var result4 = parse_integer();
+          if (input.substr(pos).match(/^[0-9]/) !== null) {
+            var result8 = input.charAt(pos);
+            pos++;
+          } else {
+            var result8 = null;
+            if (reportMatchFailures) {
+              matchFailed("[0-9]");
+            }
+          }
+          if (result8 !== null) {
+            var result4 = [];
+            while (result8 !== null) {
+              result4.push(result8);
+              if (input.substr(pos).match(/^[0-9]/) !== null) {
+                var result8 = input.charAt(pos);
+                pos++;
+              } else {
+                var result8 = null;
+                if (reportMatchFailures) {
+                  matchFailed("[0-9]");
+                }
+              }
+            }
+          } else {
+            var result4 = null;
+          }
           if (result4 !== null) {
             if (input.substr(pos, 1) === ".") {
               var result5 = ".";
@@ -851,7 +1043,32 @@ smalltalk.parser = (function(){
               }
             }
             if (result5 !== null) {
-              var result6 = parse_integer();
+              if (input.substr(pos).match(/^[0-9]/) !== null) {
+                var result7 = input.charAt(pos);
+                pos++;
+              } else {
+                var result7 = null;
+                if (reportMatchFailures) {
+                  matchFailed("[0-9]");
+                }
+              }
+              if (result7 !== null) {
+                var result6 = [];
+                while (result7 !== null) {
+                  result6.push(result7);
+                  if (input.substr(pos).match(/^[0-9]/) !== null) {
+                    var result7 = input.charAt(pos);
+                    pos++;
+                  } else {
+                    var result7 = null;
+                    if (reportMatchFailures) {
+                      matchFailed("[0-9]");
+                    }
+                  }
+                }
+              } else {
+                var result6 = null;
+              }
               if (result6 !== null) {
                 var result1 = [result3, result4, result5, result6];
               } else {
@@ -871,7 +1088,7 @@ smalltalk.parser = (function(){
           pos = savedPos1;
         }
         var result2 = result1 !== null
-          ? (function(neg, int, dec) {return parseFloat((neg+int+"."+dec), 10)})(result1[0], result1[1], result1[3])
+          ? (function(neg, int, dec) {return parseFloat((neg + int.join("") + "." + dec.join("")), 10)})(result1[0], result1[1], result1[3])
           : null;
         if (result2 !== null) {
           var result0 = result2;
@@ -1430,7 +1647,7 @@ smalltalk.parser = (function(){
         
         
         var savedPos0 = pos;
-        var result1 = parse_identifier();
+        var result1 = parse_varIdentifier();
         var result2 = result1 !== null
           ? (function(identifier) {
           		  return smalltalk.VariableNode._new()

data/amber/js/parser.pegjs

@@ -3,7 +3,8 @@ start = method
 separator      = [ \t\v\f\u00A0\uFEFF\n\r\u2028\u2029]+
 comments       = (["][^"]*["])+
 ws             = (separator / comments)*
-identifier     = first:[a-z] others:[a-zA-Z0-9]* {return first + others.join("")}
+identifier     = first:[a-zA-Z] others:[a-zA-Z0-9]* {return first + others.join("")}
+varIdentifier  = first:[a-z] others:[a-zA-Z0-9]* {return first + others.join("")}
 keyword        = first:identifier last:[:] {return first + last}
 className      = first:[A-Z] others:[a-zA-Z0-9]* {return first + others.join("")}
 string         = ['] val:(("''" {return "'"} / [^'])*) ['] {
@@ -11,15 +12,17 @@ string         = ['] val:(("''" {return "'"} / [^'])*) ['] {
                	   	._value_(val.join("").replace(/\"/ig, '"'))
 	         }
 
-symbol         = "#"val:[a-zA-Z0-9]* {
-		  return smalltalk.ValueNode._new()
-               	   	._value_('smalltalk.symbolFor(val.join("").replace(/\"/ig, '"')))
+symbol         = "#"val:(
+			digits:[a-zA-Z0-9\:]+ {return digits.join("")} / 
+			node:string {return node._value()})* {
+		  		    return smalltalk.ValueNode._new()
+               	   		    	   ._value_(smalltalk.symbolFor(val.join("").replace(/\"/ig, '"')))
                	 }
 number         = n:(float / integer) {
 		  return smalltalk.ValueNode._new()
                	   	._value_(n)
                	 }
-float          = neg:[-]?int:integer "." dec:integer {return parseFloat((neg+int+"."+dec), 10)}
+float          = neg:[-]?int:[0-9]+ "." dec:[0-9]+ {return parseFloat((neg + int.join("") + "." + dec.join("")), 10)}
 integer        = neg:[-]?digits:[0-9]+ {return (parseInt(neg+digits.join(""), 10))}
 literalArray   = "#(" ws lits:(lit:literal ws {return lit._value()})* ws ")" {
 		  return smalltalk.ValueNode._new()
@@ -42,7 +45,7 @@ pseudoVariable = val:(
 literal        = pseudoVariable / number / literalArray / dynamicDictionary / dynamicArray / string / symbol / block
 
 
-variable       = identifier:identifier {
+variable       = identifier:varIdentifier {
 		  return smalltalk.VariableNode._new()
 			._value_(identifier)
 		  }