fancy 0.7.0 → 0.8.0

data/lib/compiler.fy

@@ -8,7 +8,7 @@ require: "compiler/ast"
 
 require: "parser"
 
-if: (ARGV main?: __FILE__) then: {
+__FILE__ if_main: {
   require: "compiler/command"
   Fancy Compiler Command run: (ARGV rest)
 }

data/lib/compiler/ast/assign.fy

@@ -1,7 +1,6 @@
 class Fancy AST {
   class Assignment : Node {
-    def initialize: @line var: @lvalue value: @rvalue {
-    }
+    def initialize: @line var: @lvalue value: @rvalue
 
     def bytecode: g {
       pos(g)
@@ -11,8 +10,7 @@ class Fancy AST {
 
   class MultipleAssignment : Node {
     class MultipleAssignmentExpr : Node {
-      def initialize: @line index: @index {
-      }
+      def initialize: @line index: @index
 
       def bytecode: g {
         pos(g)
@@ -24,8 +22,7 @@ class Fancy AST {
     }
 
     class SplatAssignmentExpr : Node {
-      def initialize: @line start_index: @start_index {
-      }
+      def initialize: @line start_index: @start_index
 
       def bytecode: g {
         pos(g)
@@ -36,8 +33,7 @@ class Fancy AST {
       }
     }
 
-    def initialize: @line var: @idents value: @values {
-    }
+    def initialize: @line var: @idents value: @values
 
     def bytecode: g {
       pos(g)

data/lib/compiler/ast/async_send.fy

@@ -1,7 +1,6 @@
 class Fancy AST {
   class AsyncSend : Node {
-    def initialize: @line message_send: @message_send {
-    }
+    def initialize: @line message_send: @message_send
 
     def bytecode: g {
       pos(g)

data/lib/compiler/ast/block.fy

@@ -5,14 +5,19 @@ class Fancy AST {
       if: (@body empty?) then: {
         @body unshift_expression: $ NilLiteral new: @line
       }
+
       initialize(@line, @args, @body)
+
       @args create_locals: self
+
       if: (@args total_args == 0) then: {
         @arguments prelude=(nil)
       }
+
       if: (@args.total_args > 1) then: {
         @arguments prelude=('multi)
       }
+
       @arguments required_args=(@args required_args)
 
       if: @partial then: {

data/lib/compiler/ast/class_def.fy

@@ -3,6 +3,7 @@ class Fancy AST {
     def initialize: @line name: @name parent: @parent body: @body (ExpressionList new: @line) {
       { @body = ExpressionList new: @line } unless: @body
       name = nil
+
       if: (@name is_a?: NestedConstant) then: {
         name = @name scoped
       } else: {
@@ -19,7 +20,7 @@ class Fancy AST {
     def bytecode: g {
       pos(g)
       docstring = body() body() docstring
-      docstring if_true: {
+      if: docstring then: {
         setdoc = MessageSend new: @line \
                              message: (Identifier from: "for:append:" line: @line) \
                              to: (Identifier from: "Fancy::Documentation" line: @line) \

data/lib/compiler/ast/expression_list.fy

@@ -2,8 +2,7 @@ class Fancy AST {
   class ExpressionList : Node {
     read_slot: 'expressions
 
-    def initialize: @line list: @expressions ([]) {
-    }
+    def initialize: @line list: @expressions ([]);
 
     def unshift_expression: expression {
       @expressions unshift(expression)

data/lib/compiler/ast/future_send.fy

@@ -1,7 +1,6 @@
 class Fancy AST {
   class FutureSend : Node {
-    def initialize: @line message_send: @message_send {
-    }
+    def initialize: @line message_send: @message_send
 
     def bytecode: g {
       pos(g)

data/lib/compiler/ast/identifier.fy

@@ -1,6 +1,6 @@
 class Fancy AST {
   class Identifier : Node {
-    read_slots: ['string, 'line]
+    read_slots: ('string, 'line)
     read_write_slot: 'ruby_ident
 
     @@gen_ident_start = 0
@@ -24,17 +24,17 @@ class Fancy AST {
     }
 
     def name {
-      @string to_sym()
+      @string to_sym
     }
 
     def method_name: receiver ruby_send: ruby (false) {
-      ruby || @ruby_ident if_true: {
-        @string to_sym()
+      if: (ruby || @ruby_ident) then: {
+        @string to_sym
       } else: {
-        @string =~ /:$/ . if_true: {
-          @string to_sym()
+        if: (@string =~ /:$/) then: {
+          @string to_sym
         } else: {
-          ":" + @string . to_sym()
+          ":" + @string . to_sym
         }
       }
     }
@@ -44,11 +44,12 @@ class Fancy AST {
         case "__FILE__" -> return CurrentFile new: line filename: filename
         case "__LINE__" -> return CurrentLine new: line
         case "self" -> return Self new: line
+        case /^::/ -> ToplevelConstant
         case /^[A-Z].*::/ -> NestedConstant
         case /^[A-Z]/ -> Constant
         case /^@@/ -> ClassVariable
         case /^@/ -> InstanceVariable
-        case /^\*/ -> DynamicVariable
+        case /^\*[a-zA-Z0-9_-]+\*$/ -> DynamicVariable
         case _ -> Identifier
       }
       type new: line string: string
@@ -72,7 +73,7 @@ class Fancy AST {
   }
 
   class InstanceVariable : Identifier {
-    def initialize: @line string: @string {}
+    def initialize: @line string: @string
     def bytecode: g {
       pos(g)
       Rubinius AST InstanceVariableAccess new(@line, name) bytecode(g)
@@ -80,7 +81,7 @@ class Fancy AST {
   }
 
   class ClassVariable : Identifier {
-    def initialize: @line string: @string {}
+    def initialize: @line string: @string
     def bytecode: g {
       pos(g)
       Rubinius AST ClassVariableAccess new(@line, name) bytecode(g)
@@ -88,7 +89,7 @@ class Fancy AST {
   }
 
   class Constant : Identifier {
-    def initialize: @line string: @string {}
+    def initialize: @line string: @string
     def bytecode: g {
       pos(g)
       Rubinius AST ConstantAccess new(@line, name) bytecode(g)
@@ -96,19 +97,25 @@ class Fancy AST {
   }
 
   class NestedConstant : Identifier {
-    def initialize: @line string: @string {
-    }
+    def initialize: @line string: @string
 
     def initialize: @line const: const parent: parent {
       @string = (parent string) ++ "::" ++ (const string)
     }
 
     def scoped {
-      names = @string split("::")
-      parent = Constant new: @line string: (names shift())
+      names = @string split: "::"
+      parent = nil
+      match @string {
+        case /^::/ ->
+          names = names rest
+          parent = ToplevelConstant new: @line string: "::#{names shift}"
+        case _ ->
+          parent = Constant new: @line string: $ names shift
+      }
       scoped = nil
-      names each() |name| {
-        scoped = Rubinius AST ScopedConstant new(@line, parent, name to_sym())
+      names each: |name| {
+        scoped = Rubinius AST ScopedConstant new(@line, parent, name to_sym)
         parent = scoped
       }
       scoped
@@ -120,6 +127,16 @@ class Fancy AST {
     }
   }
 
+  class ToplevelConstant : Identifier {
+    def initialize: @line string: @string
+
+    def bytecode: g {
+      pos(g)
+      const_name = @string from: 2 to: -1 . to_sym # skip leading ::
+      Rubinius AST ToplevelConstant new(@line, const_name) . bytecode(g)
+    }
+  }
+
   class DynamicVariable : Identifier {
     read_slot: 'varname
     def initialize: @line string: @string {

data/lib/compiler/ast/literals.fy

@@ -1,6 +1,8 @@
 class Fancy AST {
   class NilLiteral : Rubinius AST NilLiteral {
-    def initialize: line { initialize(line) }
+    def initialize: line {
+      initialize(line)
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)
@@ -8,7 +10,9 @@ class Fancy AST {
   }
 
   class FixnumLiteral : Rubinius AST FixnumLiteral {
-    def initialize: line value: value { initialize(line, value) }
+    def initialize: line value: value {
+      initialize(line, value)
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)
@@ -16,7 +20,9 @@ class Fancy AST {
   }
 
   class NumberLiteral : Rubinius AST NumberLiteral {
-    def initialize: line value: value { initialize(line, value) }
+    def initialize: line value: value {
+      initialize(line, value)
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)
@@ -24,7 +30,9 @@ class Fancy AST {
   }
 
   class StringLiteral : Rubinius AST StringLiteral {
-    def initialize: line value: value { initialize(line, StringHelper unescape_string(value)) }
+    def initialize: line value: value {
+      initialize(line, StringHelper unescape_string(value))
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)
@@ -32,19 +40,15 @@ class Fancy AST {
   }
 
   class CurrentFile : Node {
-    def initialize: @line filename: @filename { }
+    def initialize: @line filename: @filename
     def bytecode: g {
       pos(g)
-      args = MessageArgs new: @line args: [StringLiteral new: @line value: @filename]
-      MessageSend new: @line message: (Identifier from: "current_file:" line: @line) \
-                  to: (Identifier from: "Fancy::CodeLoader" line: @line) \
-                  args: args .
-        bytecode: g
+      StringLiteral new: @line value: $ File absolute_path: @filename . bytecode: g
     }
   }
 
   class CurrentLine : Node {
-    def initialize: @line { }
+    def initialize: @line
     def bytecode: g {
       pos(g)
       FixnumLiteral new: @line value: @line . bytecode: g
@@ -52,12 +56,12 @@ class Fancy AST {
   }
 
   class Nothing : Node {
-    def initialize: @line { }
+    def initialize: @line
     def bytecode: g { pos(g) }
   }
 
   class StackTop : Node {
-    def initialize: @line { }
+    def initialize: @line
     def bytecode: g {
       pos(g)
       g dup()
@@ -65,8 +69,10 @@ class Fancy AST {
   }
 
   class StackLocal : Node {
-    def initialize: @line { }
-    def set: g { @local = g new_stack_local(); g set_stack_local(@local) }
+    def initialize: @line
+    def set: g {
+      @local = g new_stack_local(); g set_stack_local(@local)
+    }
     def bytecode: g {
       pos(g)
       g push_stack_local(@local)
@@ -74,7 +80,9 @@ class Fancy AST {
   }
 
   class Self : Rubinius AST Self {
-    def initialize: line { initialize(line) }
+    def initialize: line {
+      initialize(line)
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)
@@ -90,7 +98,9 @@ class Fancy AST {
 
   class SymbolLiteral : Rubinius AST SymbolLiteral {
     read_slot: 'value
-    def initialize: line value: value { initialize(line, value) }
+    def initialize: line value: value {
+     initialize(line, value)
+    }
     def string {
       value
     }
@@ -101,7 +111,9 @@ class Fancy AST {
   }
 
   class RegexpLiteral : Rubinius AST RegexLiteral  {
-    def initialize: line value: value { initialize(line, value, 0) }
+    def initialize: line value: value {
+      initialize(line, value, 0)
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)
@@ -109,7 +121,7 @@ class Fancy AST {
   }
 
   class ArrayLiteral : Rubinius AST ArrayLiteral {
-    read_slots: ['array]
+    read_slot: 'array
     def initialize: line array: @array {
       @array if_nil: { @array = [] }
       initialize(line, @array)

data/lib/compiler/ast/match.fy

@@ -1,10 +1,11 @@
 class Fancy AST {
   class Match : Node {
-    def initialize: @line expr: @expr body: @clauses {
-    }
+    def initialize: @line expr: @expr body: @clauses
 
     def bytecode: g set_match_args: clause {
-      "Generates bytecode for setting match clause arguments, if needed"
+      """
+      Generates bytecode for setting match clause arguments, if needed.
+      """
 
       g dup()
       skip_create_locals_label = g new_label()
@@ -94,7 +95,7 @@ class Fancy AST {
   }
 
   class MatchClause : Node {
-    read_slots: ['expr, 'body, 'match_args]
+    read_slots: ('expr, 'body, 'match_args)
 
     def initialize: @line expr: @expr body: @body args: @match_args {
       if: (@expr kind_of?: Identifier) then: {

data/lib/compiler/ast/message_send.fy

@@ -1,6 +1,6 @@
 class Fancy AST {
   class MessageSend : Node {
-    read_write_slots: ['name, 'receiver, 'args]
+    read_write_slots: ('name, 'receiver, 'args)
 
     # fast instructions to be used if possible
     FastOps = <[
@@ -12,8 +12,7 @@ class Fancy AST {
       ':> => 'meta_send_op_gt
     ]>
 
-    def initialize: @line message: @name to: @receiver (Self new: @line) args: @args (MessageArgs new: @line) {
-    }
+    def initialize: @line message: @name to: @receiver (Self new: @line) args: @args (MessageArgs new: @line);
 
     def redirect_via: redirect_message {
       message_name = SymbolLiteral new: @line value: (@name string to_sym)
@@ -96,8 +95,7 @@ class Fancy AST {
   class MessageArgs : Node {
     read_slot: 'args
 
-    def initialize: @line args: @args ([]) {
-    }
+    def initialize: @line args: @args ([]);
 
     def bytecode: g {
       pos(g)

data/lib/compiler/ast/method_def.fy

@@ -24,9 +24,6 @@ class Fancy AST {
 
     def bytecode: g {
       pos(g)
-      g push_self()
-      g send(@access, 0)
-      g pop()
 
       @name to_s =~ /^initialize:(\S)+/ if_true: {
         define_constructor_class_method: g

data/lib/compiler/ast/range.fy

@@ -1,9 +1,7 @@
 class Fancy AST {
   class RangeLiteral : Node {
-    read_slots: ['from, 'to]
-
-    def initialize: @line from: @from to: @to {
-    }
+    read_slots: ('from, 'to)
+    def initialize: @line from: @from to: @to
 
     def bytecode: g {
       pos(g)

data/lib/compiler/ast/return.fy

@@ -1,7 +1,6 @@
 class Fancy AST {
   class Return : Node {
-    def initialize: @line expr: @expr {
-    }
+    def initialize: @line expr: @expr
 
     def bytecode: g {
       pos(g)
@@ -11,8 +10,7 @@ class Fancy AST {
   }
 
   class ReturnLocal : Node {
-    def initialize: @line expr: @expr {
-    }
+    def initialize: @line expr: @expr
 
     def bytecode: g {
       pos(g)