mirah 0.1.4-java → 0.2.0-java

data/TODO.md

@@ -1,3 +1,14 @@
+- missing import should always show up in the summary of errors. eg
+
+ERROR import X
+ERROR fn X(1) doesn't exist
+
+ERROR can't find type for import X
+
+
+
+-- if a macro has a bug, the stacktrace is ugly
+
 
 
 The TODO list of DOOM
@@ -31,6 +42,8 @@ Dist
 
 Compiler Internals Improvements
 ======================
+- add generic warnings / error message facility
+-- right now we've got errors and they're ok. but it'd be better if we had something better.
 - make Mirror type systems addDefaultImports more obvious
 - faster mirah compiler build: src => class is tricky, I could make src => jar, jar => jar tho
 - switch to minitest
@@ -51,6 +64,7 @@ Compiler Internals Improvements
 - clean up javalib dir
 - don't use 1.5 as java compile target
 - make it obvious when ASTs have been dropped during macro expansion
+- add timing to phases
 
 - break compiler into phases
 ---------------
@@ -62,15 +76,19 @@ Compiler Internals Improvements
 - load type systems
 - load types for System, & predefs maybe?
 - load scoped macros / extensions
+
 # typer
 - visit script body / class bodies, skipping method bodies
 - compile macros
 - visit method bodies
+
 # finishs resolving typer wip
 - resolve proxies
 - change captured locals into binding fields
+
 # clean up / compiler prep
 - clean ast up
+
 # compile
 
 - maybe after parse, check built files to see if they need to be rebuilt, and ignore them otherwise
@@ -88,6 +106,10 @@ Warnings / Logging
 
 - improve duplicate name/sig error when multiple method defs w/ same sig mirah#273
 - code sources from macro expansion should know both the macro location and the invoke location and report both on errors so that users know where to look to debug
+- -v should only show the version, it currently says no main method too. :/
+- add -Werror where warnings become errors
+-   make block mirror type string a little nicer somehow 
+eg Can't find method java.util.concurrent.locks.ReentrantLock.synchronize(org.mirah.jvm.mirrors.BlockType)
 
 Parser
 ======
@@ -97,25 +119,53 @@ Parser
 
 Features
 ==========
+- each macro for Maps
 - Reflection Macros
 - AST formatter that converts back to something the parser can parse
 - default toString?
 - default hashCode / equals
-- change == to use equals
 - default val/no type that defers to indy
-
-eg
-def foo(x: int, y=1)
-end
-should work
-
+    eg
+      def foo(x: int, y=1)
+      end
+    should work
+- allow defining equals using def ==(other)
 - attr_reader/et al as varargs instead of just Hash. It would mean that the type info would have to come from somewhere else
 - goto: headius wants it
 - synchronize intrinsic ala java's
 - file scoped macros / extensions
 - extension syntax
-- move macro / mirahc anno to separate class dir to improve javac interop
 - public / private / protected / package scope helpers
+
+
+  # test cases
+  #  - method w/ no modifier, modifier statement, method
+  #  - modifier statement, method
+  #  - modifier statement, method, same modifier statement, method
+  #  - modifier statement, method, different modifier statement, method
+  #  - modifier statement, method containing closure w/ mdefs
+  #  - modifier fn w/ undefined method
+  #  - mdef, modifier fn mname
+  #  - modifier statement, modifiered method
+  #  - modifier statement, differently modifiered method
+  #  - modifier statement, modifiered method, unmodifiered method
+  #  - modifier statement, differently modifiered method, unmodifiered method
+
+  #  pub
+  #  def a
+  # macro def self.public(mdef: MethodDefinition)
+  # set annotation on it directly
+
+  # macro def self.public(method_names: NodeList<Symbol> or something)
+  #   find methods w/ those names, set anno on them directly
+  #   if they don't exist, blow up
+  #macro def self.public()
+    # options
+    # 1) grab typer & set current scope's default access *** best most likely
+    # 2) don't expand here, instead throw into a queue, expand all at end
+    # 3) try to infer defs needed to do it
+  #end
+
 - subclass access to super protected fields w/ @syntax
 - (0) add a gets function like Ruby
 - (2) a more "batteries included" set of imports
@@ -136,10 +186,16 @@ should work
 - understand Java 8 default methods
 - default args on non-last position params. eg when a method takes a block(read: functional interface), it should be allowed to have default args before the block arg.
 - do jruby style method lookup
+- add env var hash constant ala Ruby's ENV.
+- Thread extensions:
+  Thread.start {}, which does t=Thread.new{};t.start;t
+- macro for typecheck & cast. replace the x.kind_of? Y; Y(Object(x))
 
 Bugs
 ==========
-
+- a[-1] should work
+- array ext size
+- make sure that macro lookup looks at super classes
 - "foo: #{x || y} acts weird", my guess is that interpolation doesn't generate the right code sometimes
 - lambda's can't exist in methods! !! by which I mean that they can't close over things in methods. You can have them there, they just don't close. >:[]
 - parser can't deal w/ unquotes in hash literals when key is unquote
@@ -169,6 +225,11 @@ class C
             ^^^^^^^^^
 
 
+- constants are not referrable outside the defining scope :/ because they are private
+- referring to classes as constants causes crashes
+  java -jar dist/mirahc.jar -cp test/fixtures/ -e 'puts org::foo::A' blows up w/ a asm error
+  java -jar dist/mirahc.jar -cp test/fixtures/ -e 'puts org::foo::A.class' doesn't
+
 Libraries
 ===============
 - delegation macro library
@@ -341,4 +402,4 @@ end
 
 
 compile rake task doesn't fail, if it doesn't work for some things, it goes on anyway
-in generics. hmm
+in generics. hmm

data/bin/mirah

@@ -24,4 +24,4 @@ rescue LoadError
   require 'mirah'
 end
 
-Mirah.run(*ARGV)
+org::mirah::tool::RunCommand.main(ARGV)

data/bin/mirahc

@@ -24,4 +24,4 @@ rescue LoadError
   require 'mirah'
 end
 
-Mirah.compile(*ARGV)
+org::mirah::tool::Mirahc.main(ARGV)

data/examples/bintrees.mirah

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 class BinaryTrees
-  def self.main(args:String[])
+  def self.main(args:String[]):void
     n = 0
     n = Integer.parseInt(args[0]) if args.length > 0
 
@@ -72,7 +72,7 @@ class TreeNode
 
   def itemCheck
     # if necessary deallocate here
-    if @left == nil
+    if @left.nil?
       @item
     else
       @item + @left.itemCheck - @right.itemCheck

data/examples/construction.mirah

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import "java.lang.StringBuffer"
-import "java.util.ArrayList"
+import java.lang.StringBuffer
+import java.util.ArrayList
 
 list = ArrayList.new
 sb = StringBuffer.new("Hello")

data/examples/fields.mirah

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import 'java.util.ArrayList'
+import java.util.ArrayList
 
 class Bar
   def initialize

data/examples/fractal.mirah

@@ -64,7 +64,7 @@ end
 i = 0
 while i < 10
   start = System.currentTimeMillis
-  run
+  run()
   puts "Time: #{(System.currentTimeMillis - start) / 1000.0}"
   i += 1
 end

data/examples/fractal.rb

@@ -0,0 +1,70 @@
+# Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+# All contributing project authors may be found in the NOTICE file.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+def run
+  puts "Rendering"
+  y = -39.0
+  while y <= 39.0
+    puts
+    x = -39.0
+    while x <= 39.0
+      i = iterate(x/40.0,y/40.0)
+      if (i == 0)
+        print "*"
+      else
+        print " "
+      end
+      x += 1
+    end
+    y += 1
+  end
+  puts
+end
+
+def iterate(x:double,y:double)
+  cr = y-0.5
+  ci = x
+  zi = 0.0
+  zr = 0.0
+  i = 0
+
+  result = 0
+  while true
+    i += 1
+    temp = zr * zi
+    zr2 = zr * zr
+    zi2 = zi * zi
+    zr = zr2 - zi2 + cr
+    zi = temp + temp + ci
+    if (zi2 + zr2 > 16)
+      result = i
+      break
+    end
+    if (i > 1000)
+      result = 0
+      break
+    end
+  end
+
+  result
+end
+
+i = 0
+while i < 10
+  start = System.currentTimeMillis
+  run()
+  puts "Time: #{(System.currentTimeMillis - start) / 1000.0}"
+  i += 1
+end

data/examples/interfaces.mirah

@@ -17,7 +17,7 @@ import java.util.List
 
 interface Printer do
   def printAll(a:List)
-    returns void
+    void
   end
 end
 

data/examples/java_thing.mirah

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import "java.lang.System"
+import java.lang.System
 
 def foo
   home = System.getProperty "java.home"

data/examples/macros/square.mirah

@@ -16,9 +16,9 @@
 
 
 macro def sqrt(input)
-    quote do
-        Math.sqrt(Integer.parseInt(`input`))
-    end
+  quote do
+    Math.sqrt(Integer.parseInt(`input`))
+  end
 end
 
 number = '64'

data/examples/macros/square_int.mirah

@@ -16,9 +16,9 @@
 
 
 macro def sqrt(input)
-    quote do
-        Math.sqrt(`input`)
-    end
+  quote do
+    Math.sqrt(`input`)
+  end
 end
 
 number = 64

data/examples/macros/string_each_char.mirah

@@ -15,14 +15,14 @@
 
 
 macro def eachChar(value, block:Block)
-    quote {
-        `value`.toCharArray.each do |`block.arguments`|
-            `block.body`
-        end
-    }
+  quote do
+    `value`.toCharArray.each do |`block.arguments`|
+      `block.body`
+    end
+  end
 end
 
 eachChar('laat de leeeuw niet in zijn hempie staan') do | my_char |
-    puts my_char
+  puts my_char
 end
 

data/examples/rosettacode/100-doors.mirah

@@ -17,8 +17,6 @@
 import java.util.ArrayList
 
 class Door
-	:state
-
 	def initialize
 		@state=false
 	end

data/examples/rosettacode/count-occurrences-of-a-substring.mirah

@@ -18,7 +18,7 @@ import java.util.regex.Pattern
 import java.util.regex.Matcher
 
 #The "remove and count the difference" method
-def count_substring(pattern:string, source:string)
+def count_substring(pattern:String, source:String)
     (source.length() - source.replace(pattern, "").length()) / pattern.length()
 end
 
@@ -28,7 +28,7 @@ puts count_substring("a*b", "abaabba*bbaba*bbab")   # ==> 2
 
 
 # The "split and count" method
-def count_substring2(pattern:string, source:string)
+def count_substring2(pattern:String, source:String)
     # the result of split() will contain one more element than the delimiter
 	# the "-1" second argument makes it not discard trailing empty strings
     source.split(Pattern.quote(pattern), -1).length - 1
@@ -40,7 +40,7 @@ puts count_substring2("a*b", "abaabba*bbaba*bbab")   # ==> 2
 
 
 # This method does a match and counts how many times it matches
-def count_substring3(pattern:string, source:string)
+def count_substring3(pattern:String, source:String)
     result = 0
     Matcher m = Pattern.compile(Pattern.quote(pattern)).matcher(source);
     while (m.find())

data/examples/rosettacode/empty-string.mirah

@@ -19,6 +19,6 @@ empty_string2 = String.new
 
 puts "empty string is empty" if empty_string1.isEmpty()
 puts "empty string has no length" if empty_string2.length() == 0
-puts "empty string is not nil" unless empty_string1 == nil
+puts "empty string is not nil" unless empty_string1.nil?
 
 

data/examples/rosettacode/fizz-buzz.mirah

@@ -15,10 +15,10 @@
 
 
 1.upto(100) do |n|
-    print "Fizz" if a = ((n % 3) == 0)
-    print "Buzz" if b = ((n % 5) == 0)
-    print n unless (a || b)
-    print "\n"
+  print "Fizz" if a = ((n % 3) == 0)
+  print "Buzz" if b = ((n % 5) == 0)
+  print n unless (a || b)
+  print "\n"
 end
 
 # a little more straight forward

data/examples/rosettacode/is-string-numeric.mirah

@@ -19,7 +19,7 @@ import java.util.Scanner
 
 # this first example relies on catching an exception,
 # which is bad style and poorly performing in Java
-def is_numeric?(s:string)
+def is_numeric?(s:String)
     begin
         Double.parseDouble(s)
         return true
@@ -40,7 +40,7 @@ puts '1.2.3 is not numeric' unless is_numeric?('1.2.3')
 
 
 # check every element of the string
-def is_numeric2?(s: string)
+def is_numeric2?(s: String)
     if (s == nil || s.isEmpty())
         return false
     end
@@ -79,7 +79,7 @@ puts '1.2.3 is not numeric' unless is_numeric2?('1.2.3')
 
 
 # use a regular  expression
-def is_numeric3?(s:string)
+def is_numeric3?(s:String)
   s == nil || s.matches("[-+]?\\d+(\\.\\d+)?")
 end
 
@@ -98,8 +98,8 @@ puts '1.2.3 is not numeric' unless is_numeric3?('1.2.3')
 # (a more robust solution). If, after parsing, the parse position is at
 # the end of the string, we can deduce that the entire string was a
 # valid number.
-def is_numeric4?(s:string)
-    return false if s == nil
+def is_numeric4?(s:String)
+    return false if s.nil?
     formatter = NumberFormat.getInstance()
     pos = ParsePosition.new(0)
     formatter.parse(s, pos)
@@ -123,8 +123,8 @@ puts '1.2.3 is not numeric' unless is_numeric4?('1.2.3')
 # shorts, bytes, doubles, floats, BigIntegers, and BigDecimals as well
 # as methods for integral types where you may input a base/radix other than
 # 10 (10 is the default, which can be changed using the useRadix method).
-def is_numeric5?(s:string)
-    return false if s == nil
+def is_numeric5?(s:String)
+    return false if s.nil?
     Scanner sc = Scanner.new(s)
     sc.hasNextDouble()
 end