COPYING LICENSE.kawa src/main/gnu/math/BaseUnit.java src/main/gnu/math/BitOps.java src/main/gnu/math/CComplex.java src/main/gnu/math/CQuantity.java src/main/gnu/math/Complex.java src/main/gnu/math/DComplex.java src/main/gnu/math/DFloNum.java src/main/gnu/math/DQuantity.java src/main/gnu/math/DateTime.java src/main/gnu/math/Dimensions.java src/main/gnu/math/Duration.java src/main/gnu/math/ExponentialFormat.java src/main/gnu/math/FixedRealFormat.java src/main/gnu/math/IntFraction.java src/main/gnu/math/IntNum.java src/main/gnu/math/MPN.java src/main/gnu/math/MulUnit.java src/main/gnu/math/NamedUnit.java src/main/gnu/math/Numeric.java src/main/gnu/math/Quantity.java src/main/gnu/math/RatNum.java src/main/gnu/math/RealNum.java src/main/gnu/math/Unit.java src/main/ioke/lang/False.java src/main/ioke/lang/Mixins.java src/main/ioke/lang/Number.java src/main/ioke/lang/True.java src/main/ioke/lang/exceptions/ObjectIsNotRightType.java src/main/ioke/lang/mixins/Comparing.java test/number_spec.rb test/operators_spec.rb test/parsing_spec.rb test/scripts/bench_fib_rec.ik test/scripts/fib_iter.ik test/scripts/fib_rec.ik @@ -61,6 +61,18 @@ </jar> </target> + <target name="jar-notest" depends="compile" description="Create the ioke.jar file"> + <jar destfile="${lib.dist.dir}/ioke.jar"> + <fileset dir="${classes.dir}"> + <include name="**/*.class"/> + <include name="**/*.properties"/> + </fileset> + <manifest> + <attribute name="Built-By" value="${user.name}"/> + </manifest> + </jar> + </target> + <target name="clean" description="clean almost everything"> <delete dir="${build.dir}"/> <delete file="${lib.dist.dir}/ioke.jar" quiet="true"/> build.xml @@ -2,10 +2,12 @@ grammar ioke; options { output = AST; + backtrack = true; } tokens { MESSAGE_SEND; + MESSAGE_SEND_EMPTY; } @lexer::header { @@ -16,10 +18,28 @@ package ioke.lang.parser; package ioke.lang.parser; } -@lexer::members { +@members { + protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException { + throw new MismatchedTokenException(ttype, input); + } + + public void recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException { + reportError(e); + throw e; + } } -@members { +@rulecatch { + catch(RecognitionException e) { + throw e; + } +} + +@lexer::members { + public void reportError(RecognitionException e) { + displayRecognitionError(this.getTokenNames(), e); + throw new RuntimeException(e); + } } messageChain @@ -34,24 +54,23 @@ commatedExpression assignmentExpression : - expression (Equals expression)? + expression+ (binaryOperator expression)? ; expression : - literal - | message - | Terminator - ; - -message - : Identifier ('(' commatedExpression? ')')? -> ^(MESSAGE_SEND Identifier commatedExpression?) + | binaryOperator '(' commatedExpression? ')' -> ^(MESSAGE_SEND binaryOperator commatedExpression?) + | '(' commatedExpression? ')' -> ^(MESSAGE_SEND_EMPTY commatedExpression?) + | StringLiteral + | NumberLiteral + | Terminator ; -literal +binaryOperator : - StringLiteral + ComparisonOperator + | Equals ; Identifier @@ -59,6 +78,10 @@ Identifier Letter (Letter|IDDigit|StrangeChars)* ; +NumberLiteral + : '0' + | ('1'..'9') Digit* + ; StringLiteral : '"' ( EscapeSequence | ~('\\'|'"') )* '"' @@ -75,6 +98,11 @@ LineComment : '#' ~('\n'|'\r')* {$channel=HIDDEN;} ; +ComparisonOperator + : + '<' + ; + Equals : '=' @@ -105,6 +133,9 @@ UnicodeEscape ; fragment +Digit : '0'..'9' ; + +fragment HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ; fragment src/grammar/ioke.g @@ -16,6 +16,12 @@ public class DefaultBehavior extends IokeObject { } public void init() { + registerMethod(new JavaMethod(runtime, "", "returns result of evaluating first argument") { + public IokeObject activate(Context context, Message message, IokeObject on) { + return message.getEvaluatedArgument(0, context); + } + }); + registerMethod(new JavaMethod(runtime, "internal:createText", "expects one 'strange' argument. creates a new instance of Text with the given Java String backing it.") { public IokeObject activate(Context context, Message message, IokeObject on) { String s = (String)message.getArg1(); @@ -24,6 +30,13 @@ public class DefaultBehavior extends IokeObject { } }); + registerMethod(new JavaMethod(runtime, "internal:createNumber", "expects one 'strange' argument. creates a new instance of Number that represents the number found in the strange argument.") { + public IokeObject activate(Context context, Message message, IokeObject on) { + String s = (String)message.getArg1(); + return new Number(runtime, s); + } + }); + registerMethod(new JavaMethod(runtime, "=", "expects two arguments, the first unevaluated, the second evaluated. assigns the result of evaluating the second argument in the context of the caller, and assigns this result to the name provided by the first argument. the first argument remains unevaluated. the result of the assignment is the value assigned to the name. if the second argument is a method-like object and it's name is not set, that name will be set to the name of the cell.") { public IokeObject activate(Context context, Message message, IokeObject on) { String name = ((Message)message.getArg1()).getName(); @@ -59,7 +72,7 @@ public class DefaultBehavior extends IokeObject { registerMethod(new JavaMethod(runtime, "method", "expects any number of unevaluated arguments. if no arguments at all are given, will just return nil. creates a new method based on the arguments. this method will be evaluated using the context of the object it's called on, and thus the definition can not refer to the outside scope where the method is defined. (there are other ways of achieving this). all arguments except the last one is expected to be names of arguments that will be used in the method. there will possible be additions to the format of arguments later on - including named parameters and optional arguments. the actual code is the last argument given.") { public IokeObject activate(Context context, Message message, IokeObject on) { - List<IokeObject> args = message.getArguments(); + List<Object> args = message.getArguments(); if(args.size() == 0) { return new JavaMethod(runtime, "nil", "returns nil") { @@ -69,7 +82,7 @@ public class DefaultBehavior extends IokeObject { } List<String> argNames = new ArrayList<String>(args.size()-1); - for(IokeObject obj : args.subList(0, args.size()-1)) { + for(Object obj : args.subList(0, args.size()-1)) { argNames.add(((Message)obj).getName()); } src/main/ioke/lang/DefaultBehavior.java @@ -26,10 +26,14 @@ public class Ground extends IokeObject { registerCell("System", runtime.system); registerCell("Runtime", runtime.runtime); registerCell("Text", runtime.text); + registerCell("Number", runtime.number); registerCell("nil", runtime.nil); + registerCell("true", runtime._true); + registerCell("false", runtime._false); registerCell("Method", runtime.method); registerCell("DefaultMethod", runtime.defaultMethod); registerCell("JavaMethod", runtime.javaMethod); + registerCell("Mixins", runtime.mixins); } public String toString() { src/main/ioke/lang/Ground.java @@ -11,15 +11,16 @@ import java.util.IdentityHashMap; import ioke.lang.exceptions.NotActivatableException; import ioke.lang.exceptions.NoSuchCellException; +import ioke.lang.exceptions.ObjectIsNotRightType; /** * @author <a href="mailto:ola.bini@gmail.com">Ola Bini</a> */ public class IokeObject { - Runtime runtime; - String documentation; - Map<String, IokeObject> cells = new HashMap<String, IokeObject>(); - List<IokeObject> mimics = new ArrayList<IokeObject>(); + public Runtime runtime; + public String documentation; + public Map<String, IokeObject> cells = new HashMap<String, IokeObject>(); + public List<IokeObject> mimics = new ArrayList<IokeObject>(); public IokeObject(Runtime runtime, String documentation) { this.runtime = runtime; @@ -97,6 +98,10 @@ public class IokeObject { return false; } + public Number convertToNumber() { + throw new ObjectIsNotRightType(this, "Number"); + } + public IokeObject getOrActivate(Context context, Message message, IokeObject on) { if(isActivatable()) { return activate(context, message, on); src/main/ioke/lang/IokeObject.java @@ -15,10 +15,12 @@ import ioke.lang.parser.iokeParser; * @author <a href="mailto:ola.bini@gmail.com">Ola Bini</a> */ public class Message extends IokeObject { + private static enum Type {MESSAGE, BINARY, BINARY_ASSIGNMENT}; + private String name; - private Object arg1; - private Object arg2; - private List<IokeObject> arguments = new ArrayList<IokeObject>(); + private Type type = Type.MESSAGE; + + private List<Object> arguments = new ArrayList<Object>(); Message next; Message prev; @@ -27,19 +29,27 @@ public class Message extends IokeObject { this(runtime, name, null); } + public Message(Runtime runtime, String name, Object arg1, Type type) { + this(runtime, name, arg1); + this.type = type; + } + public Message(Runtime runtime, String name, Object arg1) { super(runtime, "<message " + name + ">"); this.name = name; - this.arg1 = arg1; + + if(arg1 != null) { + arguments.add(arg1); + } } - public List<IokeObject> getArguments() { + public List<Object> getArguments() { return arguments; } IokeObject allocateCopy() { - Message m = new Message(runtime, name, arg1); - m.arg2 = arg2; + Message m = new Message(runtime, name); + m.arguments = new ArrayList<Object>(this.arguments); return m; } @@ -47,37 +57,47 @@ public class Message extends IokeObject { this.next = next; } + private static Message fromMessageSend(Runtime runtime, String name, int argStart, Tree tree) { + Message m = new Message(runtime, name); + Message currentArg = null; + for(int i=argStart,j=tree.getChildCount(); i<j; i++) { + if(currentArg == null) { + currentArg = fromTree(runtime, tree.getChild(i)); + if(currentArg.name.equals(",")) { + currentArg = null; + } else { + m.arguments.add(currentArg); + } + } else { + currentArg.next = fromTree(runtime, tree.getChild(i)); + currentArg.next.prev = currentArg; + currentArg = currentArg.next; + } + } + return m; + } + public static Message fromTree(Runtime runtime, Tree tree) { if(!tree.isNil()) { switch(tree.getType()) { case iokeParser.StringLiteral: return new Message(runtime, "internal:createText", tree.getText()); + case iokeParser.NumberLiteral: + return new Message(runtime, "internal:createNumber", tree.getText()); case iokeParser.Identifier: return new Message(runtime, tree.getText()); case iokeParser.Terminator: return new Message(runtime, ";"); case iokeParser.Equals: - return new Message(runtime, "="); + return new Message(runtime, "=", null, Type.BINARY_ASSIGNMENT); case iokeParser.Comma: return new Message(runtime, ","); + case iokeParser.ComparisonOperator: + return new Message(runtime, tree.getText(), null, Type.BINARY); + case iokeParser.MESSAGE_SEND_EMPTY: + return fromMessageSend(runtime, "", 0, tree); case iokeParser.MESSAGE_SEND: - Message m = new Message(runtime, tree.getChild(0).getText()); - Message currentArg = null; - for(int i=1,j=tree.getChildCount(); i<j; i++) { - if(currentArg == null) { - currentArg = fromTree(runtime, tree.getChild(i)); - if(currentArg.name.equals(",")) { - currentArg = null; - } else { - m.arguments.add(currentArg); - } - } else { - currentArg.next = fromTree(runtime, tree.getChild(i)); - currentArg.next.prev = currentArg; - currentArg = currentArg.next; - } - } - return m; + return fromMessageSend(runtime, tree.getChild(0).getText(), 1, tree); default: java.lang.System.err.println("NOOOO: Can't handle " + tree + " : " + tree.getType()); } @@ -90,24 +110,28 @@ public class Message extends IokeObject { for(int i=0,j=tree.getChildCount(); i<j; i++) { Message created = fromTree(runtime, tree.getChild(i)); - - if(currents.size() > 0 && currents.get(0).name.equals("=")) { - currents.get(0).arg1 = currents.get(0).prev; + if(currents.size() > 0 && currents.get(0).type == Type.BINARY_ASSIGNMENT) { + currents.get(0).arguments.add(null); + currents.get(0).arguments.add(null); + currents.get(0).arguments.set(0,currents.get(0).prev); currents.get(0).prev.next = null; if(currents.get(0).prev.prev != null) { currents.get(0).prev = currents.get(0).prev.prev; currents.get(0).prev.next = currents.get(0); - ((Message)currents.get(0).arg1).prev = null; + ((Message)currents.get(0).arguments.get(0)).prev = null; } else { - if(currents.get(0).arg1 == head) { + if(currents.get(0).arguments.get(0) == head) { head = currents.get(0); } currents.get(0).prev = null; } - currents.get(0).arg2 = created; + currents.get(0).arguments.set(1,created); + currents.add(0, created); + } else if(currents.size() > 0 && currents.get(0).type == Type.BINARY) { + currents.get(0).arguments.add(created); currents.add(0, created); } else { if(created.name.equals(";") && currents.size() > 1) { @@ -135,18 +159,34 @@ public class Message extends IokeObject { return name; } + public IokeObject getEvaluatedArgument(int index, Context context) { + Object o = arguments.get(index); + if(!(o instanceof Message)) { + return (IokeObject)o; + } + + return ((Message)o).evaluateCompleteWith(context, context.ground); + } + public Object getArg1() { - return arg1; + return arguments.get(0); } public Object getArg2() { - return arg2; + return arguments.get(1); } public IokeObject sendTo(Context context, IokeObject recv) { return recv.perform(context, this); } + public IokeObject sendTo(Context context, IokeObject recv, IokeObject argument) { + Message m = (Message)allocateCopy(); + m.arguments.clear(); + m.arguments.add(argument); + return recv.perform(context, m); + } + public IokeObject evaluateComplete() { return evaluateCompleteWith(runtime.getGround()); } @@ -173,8 +213,14 @@ public class Message extends IokeObject { @Override public String toString() { - if(arg1 != null) { - return name + "(" + arg1 + ", " + arg2 + ")" + (null == next ? "" : " " + next); + if(arguments.size() > 0) { + StringBuilder sb = new StringBuilder(); + String sep = ""; + for(Object o : arguments) { + sb.append(sep).append(o); + sep = ", "; + } + return name + "(" + sb + ")" + (null == next ? "" : " " + next); } else { return name + (null == next ? "" : " " + next); } src/main/ioke/lang/Message.java @@ -17,6 +17,14 @@ public class Origin extends IokeObject { } public void init() { + // asText, asRepresentation + registerMethod(new JavaMethod(runtime, "println", "Prints a text representation to standard output") { + public IokeObject activate(Context context, Message message, IokeObject on) { + runtime.getOut().println(runtime.asText.sendTo(context, on).toString()); + runtime.getOut().flush(); + return runtime.getNil(); + } + }); } public String toString() { src/main/ioke/lang/Origin.java @@ -35,14 +35,19 @@ public class Runtime { DefaultBehavior defaultBehavior = new DefaultBehavior(this, "DefaultBehavior is a mixin that provides most of the methods shared by most instances in the system."); Origin origin = new Origin(this, "Any object created from scratch should usually be derived from Origin."); Nil nil = new Nil(this, "nil is an oddball object that always represents itself. It can not be mimicked and is one of the two false values."); - Text text = new Text(this, "Contains an immutable text."); + True _true = new True(this, "true is an oddball object that always represents itself. It can not be mimicked and represents the a true value."); + False _false = new False(this, "false is an oddball object that always represents itself. It can not be mimicked and is one of the two false values."); + Text text = new Text(this, "", "Contains an immutable text."); + Number number = new Number(this, "0", "Represents an exact number"); Method method = new Method(this, null, "Method is the origin of all methods in the system, both default and Java.."); DefaultMethod defaultMethod = new DefaultMethod(this, null, "DefaultMethod is the instance all methods in the system is derived from."); JavaMethod javaMethod = new JavaMethod(this, null, "JavaMethod is a derivation of Method that represents a primitive implemented in Java."); + Mixins mixins = new Mixins(this, "Mixins is the name space for most mixins in the system. DefaultBehavior is the notable exception."); // Core messages public Message asText = new Message(this, "asText"); public Message mimic = new Message(this, "mimic"); + public Message spaceShip = new Message(this, "<=>"); // NOT TO BE EXPOSED TO Ioke - used for internal usage only NullObject nul = new NullObject(this); @@ -74,12 +79,16 @@ public class Runtime { public void init() { base.init(); defaultBehavior.init(); + mixins.init(); system.init(); runtime.init(); ground.init(); origin.init(); nil.init(); + _true.init(); + _false.init(); text.init(); + number.init(); ground.mimics(base); ground.mimics(defaultBehavior); @@ -89,7 +98,10 @@ public class Runtime { runtime.mimics(defaultBehavior); nil.mimics(origin); + _true.mimics(origin); + _false.mimics(origin); text.mimics(origin); + number.mimics(origin); method.init(); defaultMethod.init(); @@ -115,6 +127,10 @@ public class Runtime { return this.text; } + public Number getNumber() { + return this.number; + } + public Base getBase() { return this.base; } @@ -127,10 +143,12 @@ public class Runtime { return this.nil; } - public IokeObject evaluateStream(Reader reader) { + public Message parseStream(Reader reader) { try { iokeParser parser = new iokeParser(new CommonTokenStream(new iokeLexer(new ANTLRReaderStream(reader)))); - return Message.fromTree(this, (Tree)(parser.messageChain().getTree())).evaluateComplete(); + Message m = Message.fromTree(this, (Tree)(parser.messageChain().getTree())); +// System.err.println(m); + return m; } catch(RuntimeException e) { throw e; } catch(Exception e) { @@ -138,6 +156,10 @@ public class Runtime { } } + public IokeObject evaluateStream(Reader reader) { + return parseStream(reader).evaluateComplete(); + } + public IokeObject evaluateFile(String filename) { try { return evaluateStream(new FileReader(filename)); src/main/ioke/lang/Runtime.java @@ -11,7 +11,13 @@ public class Text extends IokeObject { private String text; public Text(Runtime runtime, String text) { - super(runtime, "Text: " + text); + super(runtime, runtime.text.documentation); + this.mimics(runtime.text); + this.text = text; + } + + public Text(Runtime runtime, String text, String description) { + super(runtime, description); if(runtime.text != null) { this.mimics(runtime.text); } @@ -23,13 +29,6 @@ public class Text extends IokeObject { } public void init() { - registerMethod(new JavaMethod(runtime, "println", "Prints the text to standard output") { - public IokeObject activate(Context context, Message message, IokeObject on) { - runtime.getOut().println(runtime.asText.sendTo(context, on).toString()); - runtime.getOut().flush(); - return runtime.getNil(); - } - }); registerMethod(new JavaMethod(runtime, "asText", "Returns a text representation of the object") { public IokeObject activate(Context context, Message message, IokeObject on) { return on; src/main/ioke/lang/Text.java @@ -3,6 +3,9 @@ */ package ioke.lang.exceptions; +import java.util.ArrayList; +import java.util.List; + /** * * @author <a href="mailto:ola.bini@gmail.com">Ola Bini</a> @@ -23,4 +26,17 @@ public class IokeException extends RuntimeException { public IokeException(String message, Throwable cause) { super(message, cause); } + + public StackTraceElement[] getStackTrace() { + StackTraceElement[] trace = super.getStackTrace(); + + List<StackTraceElement> stes = new ArrayList<StackTraceElement>(); + for(StackTraceElement ste : trace) { + stes.add(ste); + if(ste.getClassName().equals("ioke.lang.Runtime") && ste.getMethodName().equals("evaluateStream")) { + break; + } + } + return stes.toArray(new StackTraceElement[0]); + } }// IokeException src/main/ioke/lang/exceptions/IokeException.java c0bf1c7ffd953561a50f365eb8fabdc5a9d11905 Ola Bini ola.bini@gmail.com http://github.com/olabini/ioke/commit/06267b02546de557406829e9b00e8bde0b38fc31 06267b02546de557406829e9b00e8bde0b38fc31 2008-10-12T09:56:34-07:00 2008-10-12T09:56:34-07:00 Add Numbers, and gnu math. Add empty message send, add mixin structure and comparators 0ba8bb04f0b868a8d4c0c165cec35d4e6bf9d2d6 Ola Bini ola.bini@gmail.com