LICENSE.icu4j bin/Antlr3.Runtime.dll bin/Antlr3.Runtime.dll.mdb bin/Antlr3.Runtime.xml bin/Antlr3.Utility.XML bin/Antlr3.Utility.dll bin/Antlr3.Utility.dll.mdb bin/FSharp.Core.dll bin/StringTemplate.dll bin/antlr.runtime.dll ioke-ikc.build src/ikc/builtin/D50_runtime.ik src/ikc/grammar/ioke.g src/ikc/main/Ioke.Lang/AliasMethod.cs src/ikc/main/Ioke.Lang/Arity.cs src/ikc/main/Ioke.Lang/AssignmentBehavior.cs src/ikc/main/Ioke.Lang/AssociatedCode.cs src/ikc/main/Ioke.Lang/Base.cs src/ikc/main/Ioke.Lang/Builtin.cs src/ikc/main/Ioke.Lang/Call.cs src/ikc/main/Ioke.Lang/CaseBehavior.cs src/ikc/main/Ioke.Lang/Condition.cs src/ikc/main/Ioke.Lang/ConditionsBehavior.cs src/ikc/main/Ioke.Lang/ControlFlow.cs src/ikc/main/Ioke.Lang/DateTime.cs src/ikc/main/Ioke.Lang/Decimal.cs src/ikc/main/Ioke.Lang/DefaultArgumentsDefinition.cs src/ikc/main/Ioke.Lang/DefaultBehavior.cs src/ikc/main/Ioke.Lang/DefaultMacro.cs src/ikc/main/Ioke.Lang/DefaultMethod.cs src/ikc/main/Ioke.Lang/DefaultSyntax.cs src/ikc/main/Ioke.Lang/DefinitionsBehavior.cs src/ikc/main/Ioke.Lang/Dict.cs src/ikc/main/Ioke.Lang/DokgenMain.cs src/ikc/main/Ioke.Lang/Extensions/Benchmark/Benchmark.cs src/ikc/main/Ioke.Lang/Extensions/Readline/Readline.cs src/ikc/main/Ioke.Lang/FileSystem.cs src/ikc/main/Ioke.Lang/FlowControlBehavior.cs src/ikc/main/Ioke.Lang/Globber.cs src/ikc/main/Ioke.Lang/Ground.cs src/ikc/main/Ioke.Lang/Handler.cs src/ikc/main/Ioke.Lang/ISpecMain.cs src/ikc/main/Ioke.Lang/IdentityHashTable.cs src/ikc/main/Ioke.Lang/Inspectable.cs src/ikc/main/Ioke.Lang/InternalBehavior.cs src/ikc/main/Ioke.Lang/IokeData.cs src/ikc/main/Ioke.Lang/IokeIO.cs src/ikc/main/Ioke.Lang/IokeList.cs src/ikc/main/Ioke.Lang/IokeObject.cs src/ikc/main/Ioke.Lang/IokeSet.cs src/ikc/main/Ioke.Lang/IokeSystem.cs src/ikc/main/Ioke.Lang/LexicalBlock.cs src/ikc/main/Ioke.Lang/LexicalContext.cs src/ikc/main/Ioke.Lang/LexicalMacro.cs src/ikc/main/Ioke.Lang/LiteralsBehavior.cs src/ikc/main/Ioke.Lang/Locals.cs src/ikc/main/Ioke.Lang/Main.cs src/ikc/main/Ioke.Lang/Message.cs src/ikc/main/Ioke.Lang/Method.cs src/ikc/main/Ioke.Lang/Mixins.cs src/ikc/main/Ioke.Lang/Named.cs src/ikc/main/Ioke.Lang/NativeMethod.cs src/ikc/main/Ioke.Lang/NullObject.cs src/ikc/main/Ioke.Lang/Number.cs src/ikc/main/Ioke.Lang/Origin.cs src/ikc/main/Ioke.Lang/Pair.cs src/ikc/main/Ioke.Lang/Parser/FunctionalOperatorShuffler.fs src/ikc/main/Ioke.Lang/Parser/IOperatorShuffler.cs src/ikc/main/Ioke.Lang/Parser/Levels.cs src/ikc/main/Ioke.Lang/Parser/Lexer.cs src/ikc/main/Ioke.Lang/Parser/Parser.cs src/ikc/main/Ioke.Lang/Range.cs src/ikc/main/Ioke.Lang/ReflectionBehavior.cs src/ikc/main/Ioke.Lang/Regexp.cs src/ikc/main/Ioke.Lang/RegexpMatch.cs src/ikc/main/Ioke.Lang/Rescue.cs src/ikc/main/Ioke.Lang/Restart.cs src/ikc/main/Ioke.Lang/Runtime.cs src/ikc/main/Ioke.Lang/SpaceshipComparator.cs src/ikc/main/Ioke.Lang/Symbol.cs src/ikc/main/Ioke.Lang/Text.cs src/ikc/main/Ioke.Lang/TypeChecker.cs src/ikc/main/Ioke.Lang/TypeCheckingArgumentsDefinition.cs src/ikc/main/Ioke.Lang/TypeCheckingNativeMethod.cs src/ikc/main/Ioke.Lang/Util/Dir.cs src/ikc/main/Ioke.Lang/Util/SaneArrayList.cs src/ikc/main/Ioke.Lang/Util/SaneDictionary.cs src/ikc/main/Ioke.Lang/Util/SaneHashSet.cs src/ikc/main/Ioke.Lang/Util/SaneHashtable.cs src/ikc/main/Ioke.Lang/Util/SaneList.cs src/ikc/main/Ioke.Lang/Util/SaneOrderedDictionary.cs src/ikc/main/Ioke.Lang/Util/StringUtils.cs src/ikc/main/Ioke.Math/BigDecimal.cs src/ikc/main/Ioke.Math/BitOps.cs src/ikc/main/Ioke.Math/Complex.cs src/ikc/main/Ioke.Math/IntFraction.cs src/ikc/main/Ioke.Math/IntNum.cs src/ikc/main/Ioke.Math/MPN.cs src/ikc/main/Ioke.Math/MathContext.cs src/ikc/main/Ioke.Math/Numeric.cs src/ikc/main/Ioke.Math/Quantity.cs src/ikc/main/Ioke.Math/RatNum.cs src/ikc/main/Ioke.Math/RealNum.cs src/ikc/main/NRegex/Bitset.cs src/ikc/main/NRegex/CharacterClass.cs src/ikc/main/NRegex/MatchIterator.cs src/ikc/main/NRegex/MatchResult.cs src/ikc/main/NRegex/Matcher.cs src/ikc/main/NRegex/Optimizer.cs src/ikc/main/NRegex/Pattern.cs src/ikc/main/NRegex/PatternSyntaxException.cs src/ikc/main/NRegex/PerlSubstitution.cs src/ikc/main/NRegex/RETokenizer.cs src/ikc/main/NRegex/Replacer.cs src/ikc/main/NRegex/Substitution.cs src/ikc/main/NRegex/Term.cs src/ikc/main/NRegex/TextBuffer.cs src/ikc/main/NRegex/UnicodeConstants.cs src/ikc/main/NRegex/WildcardPattern.cs src/ikc/main/getline.cs @@ -1,7 +1,13 @@ Different parts of Ioke is covered by different licences and copyrights: +ikj: The package ioke.lang is covered by the file LICENSE. The package gnu.math is covered by the file LICENSE.kawa. The package org.jregex and subpackages contains their own licensing information in the source files. +ikc: +The namepsace Ioke.Lang is covered by the file LICENSE. +The namespace Ioke.Math is covered by the file LICENSE.kawa. +The class Ioke.Math.BigDecimal and Ioke.Math.MathContext is covered by the file LICENSE.icu4j + Everything else is covered by the file LICENSE, unless noted. COPYING @@ -12,7 +12,7 @@ Condition Error Type = Condition Error mimic Condition Error Index = Condition Error mimic Condition Error RestartNotActive = Condition Error mimic Condition Error CommandLine = Condition Error mimic -Condition Error JavaException = Condition Error mimic +Condition Error NativeException = Condition Error mimic Condition Error Parser = Condition Error mimic @@ -43,8 +43,8 @@ Condition report = method( #{context stackTraceAsText}") -Condition Error JavaException report = method( - "returns a representation of this error, showing some information about the java exception", +Condition Error NativeException report = method( + "returns a representation of this error, showing some information about the native exception", stackTrace = "%[ %s\n%]" format(self exceptionStackTrace) src/builtin/A05_conditions.ik @@ -62,7 +62,7 @@ public class JavaFieldGetterNativeMethod extends Method implements NativeImpleme return result; } } catch(Exception e) { - context.runtime.reportJavaException(e, message, context); + context.runtime.reportNativeException(e, message, context); return context.runtime.nil; } } src/ikj/main/ioke/lang/JavaFieldGetterNativeMethod.java @@ -74,7 +74,7 @@ public class JavaFieldSetterNativeMethod extends Method implements NativeImpleme return result; } } catch(Exception e) { - context.runtime.reportJavaException(e, message, context); + context.runtime.reportNativeException(e, message, context); return context.runtime.nil; } } src/ikj/main/ioke/lang/JavaFieldSetterNativeMethod.java @@ -46,7 +46,7 @@ public class JavaGround { try { c = context.runtime.classRegistry.getClassLoader().loadClass(name); } catch(Exception e) { - runtime.reportJavaException(e, message, context); + runtime.reportNativeException(e, message, context); } return runtime.registry.wrap(c); } src/ikj/main/ioke/lang/JavaGround.java @@ -76,9 +76,9 @@ public class JavaMethodNativeMethod extends ioke.lang.Method implements NativeIm } } catch(Exception e) { if((Exception)e.getCause() != null) { - context.runtime.reportJavaException((Exception)e.getCause(), message, context); + context.runtime.reportNativeException((Exception)e.getCause(), message, context); } else { - context.runtime.reportJavaException((Exception)e, message, context); + context.runtime.reportNativeException((Exception)e, message, context); } return context.runtime.nil; src/ikj/main/ioke/lang/JavaMethodNativeMethod.java @@ -914,7 +914,7 @@ public class Message extends IokeData { // System.err.println(e); // System.err.println(e.getMessage()); // e.printStackTrace(); - runtime.reportJavaException(e, message, context); + runtime.reportNativeException(e, message, context); return null; } } src/ikj/main/ioke/lang/Message.java @@ -504,7 +504,7 @@ public class Runtime { ((IokeSystem)IokeObject.data(system)).pushCurrentFile(name); return evaluateStream(reader, message, context); } catch(Exception e) { - reportJavaException(e, message, context); + reportNativeException(e, message, context); return null; } finally { ((IokeSystem)IokeObject.data(system)).popCurrentFile(); @@ -516,7 +516,7 @@ public class Runtime { ((IokeSystem)IokeObject.data(system)).pushCurrentFile(f.getCanonicalPath()); return evaluateStream(new InputStreamReader(new FileInputStream(f), "UTF-8"), message, context); } catch(Exception e) { - reportJavaException(e, message, context); + reportNativeException(e, message, context); return null; } finally { ((IokeSystem)IokeObject.data(system)).popCurrentFile(); @@ -532,19 +532,19 @@ public class Runtime { return evaluateStream(new InputStreamReader(new FileInputStream(new File(((IokeSystem)IokeObject.data(system)).getCurrentWorkingDirectory(), filename)), "UTF-8"), message, context); } } catch(Exception e) { - reportJavaException(e, message, context); + reportNativeException(e, message, context); return null; } finally { ((IokeSystem)IokeObject.data(system)).popCurrentFile(); } } - public void reportJavaException(Exception e, IokeObject message, IokeObject context) throws ControlFlow { + public void reportNativeException(Exception e, IokeObject message, IokeObject context) throws ControlFlow { final IokeObject condition = IokeObject.as(IokeObject.getCellChain(this.condition, message, context, "Error", - "JavaException"), context).mimic(message, context); + "NativeException"), context).mimic(message, context); condition.setCell("message", message); condition.setCell("context", context); condition.setCell("receiver", context); src/ikj/main/ioke/lang/Runtime.java @@ -305,9 +305,9 @@ describe("Base", originNames = Origin cells keys sort ;; Easy way to remove duplicates - create a set of it and then sort it back into a list - javaGroundAllNames = JavaGround cells keys sort - groundAllNames = set(*(iokeGroundNames + groundNames + javaGroundAllNames + baseNames + defaultBehaviorAllNames)) sort - originAllNames = set(*(originNames + groundAllNames + javaGroundAllNames)) sort + nativeGroundAllNames = if(System feature?(:java), JavaGround cells keys sort, []) + groundAllNames = set(*(iokeGroundNames + groundNames + nativeGroundAllNames + baseNames + defaultBehaviorAllNames)) sort + originAllNames = set(*(originNames + groundAllNames + nativeGroundAllNames)) sort Base cellNames sort should == baseNames Base cellNames(false) sort should == baseNames test/base_spec.ik @@ -29,7 +29,7 @@ describe(true, ) ; it("should complain if no argument is given", -; fn(true and()) should signal(Condition Error JavaException) +; fn(true and()) should signal(Condition Error NativeException) ; ) it("should return the result of the argument", test/boolean_spec.ik @@ -713,9 +713,9 @@ describe(Condition, ) ) - describe(Condition Error JavaException, + describe(Condition Error NativeException, it("should have the right kind", - Condition Error JavaException should have kind("Condition Error JavaException") + Condition Error NativeException should have kind("Condition Error NativeException") ) ) test/conditions_spec.ik @@ -20,7 +20,8 @@ describe("Ground", Ground should mimic(IokeGround) ) - it("should mimic JavaGround", - Ground should mimic(JavaGround) - ) + onlyWhen(System feature?(:java), + it("should mimic JavaGround", + Ground should mimic(JavaGround) + )) ) test/ground_spec.ik @@ -39,7 +39,8 @@ describe(ISpec Runner OptionParser, ensure( parser = ISpec Runner OptionParser create(nil, nil) parser order(["--format", "specdoc", "to:", "file"]) - parser options formatters first output kind should == "java:io:PrintStream", + if(System feature?(:java), + parser options formatters first output kind should == "java:io:PrintStream"), if(FileSystem file?("file"), FileSystem removeFile!("file"))) test/ispec_spec.ik @@ -1,6 +1,7 @@ use("ispec") +if(System feature?(:java), describe("JavaGround", it("should have the correct kind", JavaGround kind should == "JavaGround" @@ -2769,3 +2770,4 @@ describe("Java Objects", ) ) ) +) test/java_ground_spec.ik @@ -1,6 +1,7 @@ use("ispec") +if(System feature?(:java), describe("JavaGround", describe("integrate", describe("extending classes and implementing interfaces", @@ -343,3 +344,4 @@ describe("JavaGround", ) ) ) +) test/java_integrate_spec.ik @@ -78,7 +78,7 @@ describe("nil", ) ; it("should complain if no argument is given", -; fn(nil or()) should signal(Condition Error JavaException) +; fn(nil or()) should signal(Condition Error NativeException) ; ) it("should return the result of the argument", @@ -124,7 +124,7 @@ describe("nil", ) ; it("should complain if no argument is given", -; fn(nil xor()) should signal(Condition Error JavaException) +; fn(nil xor()) should signal(Condition Error NativeException) ; ) it("should return true if the argument is true", @@ -150,7 +150,7 @@ describe("nil", ) ; it("should complain if no argument is given", -; fn(nil nor()) should signal(Condition Error JavaException) +; fn(nil nor()) should signal(Condition Error NativeException) ; ) it("should return false if the argument is true", test/nil_spec.ik @@ -145,11 +145,11 @@ bar" should == "foobar" ) it("should not parse correctly when mismatched", - fn(parse("foo([1, 2)]")) should signal(Condition Error JavaException) + fn(parse("foo([1, 2)]")) should signal(Condition Error NativeException) ) it("should not parse correctly when missing end", - fn(parse("[1, 2")) should signal(Condition Error JavaException) + fn(parse("[1, 2")) should signal(Condition Error NativeException) ) ) @@ -215,11 +215,11 @@ bar" should == "foobar" ) it("should not parse correctly when mismatched", - fn(parse("foo({1, 2)}")) should signal(Condition Error JavaException) + fn(parse("foo({1, 2)}")) should signal(Condition Error NativeException) ) it("should not parse correctly when missing end", - fn(parse("{1, 2")) should signal(Condition Error JavaException) + fn(parse("{1, 2")) should signal(Condition Error NativeException) ) ) test/parsing_spec.ik @@ -9,14 +9,30 @@ describe(Runtime, ) describe("machine", - it("should contain ikj", - Runtime version machine should == "ikj" + onlyWhen(System feature?(:java), + it("should contain ikj", + Runtime version machine should == "ikj" + ) + ) + + onlyWhen(System feature?(:clr), + it("should contain ikc", + Runtime version machine should == "ikc" + ) ) ) describe("versionNumber", - it("should be the correct version", - Runtime version versionNumber should == [0,4,0] + onlyWhen(System feature?(:java), + it("should be the correct version", + Runtime version versionNumber should == [0,4,0] + ) + ) + + onlyWhen(System feature?(:clr), + it("should be the correct version", + Runtime version versionNumber should == [0,1,0] + ) ) ) ) test/runtime_spec.ik 69575c6e33f52d6935c1176e30102312166a4f74 Ola Bini ola.bini@gmail.com http://github.com/olabini/ioke/commit/0c0f4ab66c138a2843ef22ff035b74c2160d54bb 0c0f4ab66c138a2843ef22ff035b74c2160d54bb 2009-04-21T03:01:33-07:00 2009-04-21T03:01:33-07:00 Merge ioke-clr 47812535c797c7e39f1402ac0f9dcaa1db523544 Ola Bini ola.bini@gmail.com