Prettier

lib/ahem/ast/for_loop.rb

@@ -9,16 +9,15 @@ class AST::ForLoop
 
   def ==(other)
     other.is_a?(AST::ForLoop) && other.iterator == @iterator &&
-      other.iterable == @iterable && other.block == @block
+      other.iterable == @iterable &&
+      other.block == @block
   end
 
   def execute(env)
     @iterable.execute(env).each do |i|
       _env = Environment.new
       _env.set(@iterator.name, i)
-      @block.statements.each do |statement|
-        statement.execute(_env)
-      end
+      @block.statements.each { |statement| statement.execute(_env) }
     end
   end
 end

lib/ahem/lexer.rb

@@ -183,18 +183,14 @@ class Lexer
 
   def scan_all
     tokens = Array.new
-    until at_end
-      tokens << get_token
-    end
+    tokens << get_token until at_end
     tokens << Token.new(TokenKinds::EOF)
   end
 
   private
 
   def skip_whitespace
-    while !at_end && @source[@position].match(/\A\s/)
-      @position += 1
-    end
+    @position += 1 while !at_end && @source[@position].match(/\A\s/)
   end
 
   def skip_comment

lib/ahem/parser.rb

@@ -20,24 +20,24 @@ class Parser
     elsif @current_token.type == TokenKinds::FUNCTION
       next_token = @lexer.peek
       if next_token && next_token.type == TokenKinds::IDENTIFIER
-				function_definition
+        function_definition
       else
-				expression_statement
+        expression_statement
       end
     elsif @current_token.type == TokenKinds::CLASS
       class_definition
     elsif @current_token.type == TokenKinds::FOR
       for_loop
     else
-			expression_statement
+      expression_statement
     end
   end
 
-	def expression_statement
+  def expression_statement
     expr = expression
     eat(TokenKinds::SEMICOLON)
     return expr
-	end
+  end
 
   def variable_declaration
     eat(TokenKinds::LET)
@@ -171,7 +171,9 @@ class Parser
     expr = binary
 
     if @current_token.type == TokenKinds::EQUALS
-      raise 'Invalid left hand side of assignment' unless expr.is_a?(AST::Identifier)
+      unless expr.is_a?(AST::Identifier)
+        raise 'Invalid left hand side of assignment'
+      end
       eat(TokenKinds::EQUALS)
       value = expression
       AST::Assignment.new(expr, value)
@@ -370,6 +372,7 @@ class Parser
 
   def eat(type)
     token = @current_token
+
     if token.type == type
       advance
       token

spec/ast/assignment_spec.rb

@@ -1,25 +1,19 @@
 RSpec.describe AST::Assignment do
   it 'reassigns an existing variable' do
     env = Environment.new
-    AST::VariableDeclaration.new(
-      AST::Identifier.new('x'),
-      AST::Number.new(5.0),
-    ).execute(env)
-    AST::Assignment.new(
-      AST::Identifier.new('x'),
-      AST::Number.new(6.0),
-    ).execute(env)
+    AST::VariableDeclaration.new(AST::Identifier.new('x'), AST::Number.new(5.0))
+      .execute(env)
+    AST::Assignment.new(AST::Identifier.new('x'), AST::Number.new(6.0)).execute(
+      env
+    )
     expect(env.get('x').execute(env)).to eq(6.0)
   end
 
   it 'raises for an undeclared variable' do
     env = Environment.new
     expect {
-      AST::Assignment.new(
-        AST::Identifier.new('x'),
-        AST::Number.new(6.0),
-      ).execute(env)
-    }.to raise_error("Undefined variable x")
-
+      AST::Assignment.new(AST::Identifier.new('x'), AST::Number.new(6.0))
+        .execute(env)
+    }.to raise_error('Undefined variable x')
   end
 end

spec/ast/class_definition_spec.rb

@@ -1,9 +1,7 @@
 RSpec.describe AST::ClassDefinition do
   it 'defines a class' do
     env = Environment.new(env)
-    klass = AST::ClassDefinition.new(
-      AST::Identifier.new('Class'), [], []
-    )
+    klass = AST::ClassDefinition.new(AST::Identifier.new('Class'), [], [])
     klass.execute(env)
     expect(env.get('Class')).to eq(klass)
   end

spec/ast/conditional_spec.rb

@@ -7,17 +7,14 @@ RSpec.describe AST::Conditional do
             AST::Binary.new(
               AST::Operators::GREATER_THAN,
               AST::Number.new(5.0),
-              AST::Number.new(4.0),
+              AST::Number.new(4.0)
             ),
-            AST::Block.new(
-              [
-                AST::String.new("5 is greater than 4")
-              ]
-            )
+            AST::Block.new([AST::String.new('5 is greater than 4')])
           )
         ]
-      ).execute(Environment.new)
-    ).to eq("5 is greater than 4")
+      )
+        .execute(Environment.new)
+    ).to eq('5 is greater than 4')
   end
 
   it 'evaluates an else statement' do
@@ -28,25 +25,18 @@ RSpec.describe AST::Conditional do
             AST::Binary.new(
               AST::Operators::GREATER_THAN,
               AST::Number.new(3.0),
-              AST::Number.new(4.0),
+              AST::Number.new(4.0)
             ),
-            AST::Block.new(
-              [
-                AST::String.new("3 is greater than 4")
-              ]
-            )
+            AST::Block.new([AST::String.new('3 is greater than 4')])
           ),
           AST::Branch.new(
             AST::Boolean.new(true),
-            AST::Block.new(
-              [
-                AST::String.new("3 is _not_ greater than 4")
-              ]
-            )
+            AST::Block.new([AST::String.new('3 is _not_ greater than 4')])
           )
         ]
-      ).execute(Environment.new)
-    ).to eq("3 is _not_ greater than 4")
+      )
+        .execute(Environment.new)
+    ).to eq('3 is _not_ greater than 4')
   end
 
   it 'evaluates an else if statement' do
@@ -57,36 +47,25 @@ RSpec.describe AST::Conditional do
             AST::Binary.new(
               AST::Operators::GREATER_THAN,
               AST::Number.new(3.0),
-              AST::Number.new(4.0),
+              AST::Number.new(4.0)
             ),
-            AST::Block.new(
-              [
-                AST::String.new("3 is greater than 4")
-              ]
-            )
+            AST::Block.new([AST::String.new('3 is greater than 4')])
           ),
           AST::Branch.new(
             AST::Binary.new(
               AST::Operators::GREATER_THAN,
               AST::Number.new(3.0),
-              AST::Number.new(2.0),
+              AST::Number.new(2.0)
             ),
-            AST::Block.new(
-              [
-                AST::String.new("3 is greater than 2")
-              ]
-            )
+            AST::Block.new([AST::String.new('3 is greater than 2')])
           ),
           AST::Branch.new(
             AST::Boolean.new(true),
-            AST::Block.new(
-              [
-                AST::String.new("3 is _not_ greater than 4")
-              ]
-            )
+            AST::Block.new([AST::String.new('3 is _not_ greater than 4')])
           )
         ]
-      ).execute(Environment.new)
-    ).to eq("3 is greater than 2")
+      )
+        .execute(Environment.new)
+    ).to eq('3 is greater than 2')
   end
 end

spec/ast/for_loop_spec.rb

@@ -4,23 +4,18 @@ RSpec.describe AST::ForLoop do
       AST::ForLoop.new(
         AST::Identifier.new('x'),
         AST::Array.new(
-          [
-            AST::Number.new(1.0),
-            AST::Number.new(2.0),
-            AST::Number.new(3.0),
-          ]
+          [AST::Number.new(1.0), AST::Number.new(2.0), AST::Number.new(3.0)]
         ),
         AST::Block.new(
           [
             AST::FunctionCall.new(
               AST::Identifier.new('print'),
-              [
-                AST::Identifier.new('x')
-              ]
+              [AST::Identifier.new('x')]
             )
           ]
         )
-      ).execute(Environment.new)
+      )
+        .execute(Environment.new)
     }.to output("1.0\n2.0\n3.0\n").to_stdout
   end
 end

spec/ast/function_call_spec.rb

@@ -4,7 +4,8 @@ RSpec.describe AST::FunctionCall do
       AST::FunctionCall.new(
         AST::Identifier.new('print'),
         [AST::String.new('hello world')]
-      ).execute(Environment.new)
+      )
+        .execute(Environment.new)
     }.to output("hello world\n").to_stdout
   end
 
@@ -13,19 +14,23 @@ RSpec.describe AST::FunctionCall do
     AST::FunctionDefinition.new(
       AST::Identifier.new('add_one'),
       [AST::Identifier.new('n')],
-      AST::Block.new([
-        AST::Binary.new(
-          AST::Operators::ADD,
-          AST::Identifier.new('n'),
-          AST::Number.new(1.0)
-        )
-      ])
-    ).execute(env)
+      AST::Block.new(
+        [
+          AST::Binary.new(
+            AST::Operators::ADD,
+            AST::Identifier.new('n'),
+            AST::Number.new(1.0)
+          )
+        ]
+      )
+    )
+      .execute(env)
     expect(
       AST::FunctionCall.new(
         AST::Identifier.new('add_one'),
         [AST::Number.new(5.0)]
-      ).execute(env)
+      )
+        .execute(env)
     ).to eq(6.0)
   end
 
@@ -43,47 +48,51 @@ RSpec.describe AST::FunctionCall do
     AST::FunctionDefinition.new(
       AST::Identifier.new('factorial'),
       [AST::Identifier.new('n')],
-      AST::Block.new([
-        AST::Conditional.new(
-          [
-            AST::Branch.new(
-              AST::Binary.new(
-                AST::Operators::DOUBLE_EQUALS,
-                AST::Identifier.new('n'),
-                AST::Number.new(0.0),
-              ),
-              AST::Block.new([
-                AST::Number.new(1.0),
-              ])
-            ),
-            AST::Branch.new(
-              AST::Boolean.new(true),
-              AST::Block.new([
+      AST::Block.new(
+        [
+          AST::Conditional.new(
+            [
+              AST::Branch.new(
                 AST::Binary.new(
-                  AST::Operators::MULTIPLY,
+                  AST::Operators::DOUBLE_EQUALS,
                   AST::Identifier.new('n'),
-                  AST::FunctionCall.new(
-                    AST::Identifier.new('factorial'),
-                    [
-                      AST::Binary.new(
-                        AST::Operators::SUBTRACT,
-                        AST::Identifier.new('n'),
-                        AST::Number.new(1.0),
+                  AST::Number.new(0.0)
+                ),
+                AST::Block.new([AST::Number.new(1.0)])
+              ),
+              AST::Branch.new(
+                AST::Boolean.new(true),
+                AST::Block.new(
+                  [
+                    AST::Binary.new(
+                      AST::Operators::MULTIPLY,
+                      AST::Identifier.new('n'),
+                      AST::FunctionCall.new(
+                        AST::Identifier.new('factorial'),
+                        [
+                          AST::Binary.new(
+                            AST::Operators::SUBTRACT,
+                            AST::Identifier.new('n'),
+                            AST::Number.new(1.0)
+                          )
+                        ]
                       )
-                    ]
-                  )
+                    )
+                  ]
                 )
-              ])
-            ),
-          ]
-        )
-      ])
-    ).execute(env)
+              )
+            ]
+          )
+        ]
+      )
+    )
+      .execute(env)
     expect(
       AST::FunctionCall.new(
         AST::Identifier.new('factorial'),
         [AST::Number.new(5.0)]
-      ).execute(env)
+      )
+        .execute(env)
     ).to eq(120.0)
   end
 
@@ -102,30 +111,28 @@ RSpec.describe AST::FunctionCall do
     AST::FunctionDefinition.new(
       AST::Identifier.new('add_one'),
       [AST::Identifier.new('n')],
-      AST::Block.new([
-        AST::Binary.new(
-          AST::Operators::ADD,
-          AST::Identifier.new('n'),
-          AST::Number.new(1.0)
-        )
-      ])
-    ).execute(env)
+      AST::Block.new(
+        [
+          AST::Binary.new(
+            AST::Operators::ADD,
+            AST::Identifier.new('n'),
+            AST::Number.new(1.0)
+          )
+        ]
+      )
+    )
+      .execute(env)
 
-    AST::FunctionCall.new(
-      AST::Identifier.new('add_one'),
-      [
-        AST::Number.new(5)
-      ]
-    ).execute(env)
+    AST::FunctionCall.new(AST::Identifier.new('add_one'), [AST::Number.new(5)])
+      .execute(env)
 
-    expect do
+    expect {
       AST::FunctionCall.new(
         AST::Identifier.new('print'),
-        [
-          AST::Identifier.new('n')
-        ]
-      ).execute(env)
-    end.to raise_error('Undefined variable n')
+        [AST::Identifier.new('n')]
+      )
+        .execute(env)
+    }.to raise_error('Undefined variable n')
   end
 
   # let add_one = function(n) { n + 1; };
@@ -137,9 +144,7 @@ RSpec.describe AST::FunctionCall do
       AST::Identifier.new('add_one'),
       AST::FunctionDefinition.new(
         nil,
-        [
-          AST::Identifier.new('n'),
-        ],
+        [AST::Identifier.new('n')],
         AST::Block.new(
           [
             AST::Binary.new(
@@ -150,36 +155,32 @@ RSpec.describe AST::FunctionCall do
           ]
         )
       )
-    ).execute(env)
+    )
+      .execute(env)
 
     AST::VariableDeclaration.new(
       AST::Identifier.new('do'),
       AST::FunctionDefinition.new(
         nil,
-        [
-          AST::Identifier.new('f'),
-          AST::Identifier.new('x'),
-        ],
+        [AST::Identifier.new('f'), AST::Identifier.new('x')],
         AST::Block.new(
           [
             AST::FunctionCall.new(
               AST::Identifier.new('f'),
-              [
-                AST::Identifier.new('x')
-              ]
+              [AST::Identifier.new('x')]
             )
           ]
         )
       )
-    ).execute(env)
+    )
+      .execute(env)
 
-    result = AST::FunctionCall.new(
-      AST::Identifier.new('do'),
-      [
-        AST::Identifier.new('add_one'),
-        AST::Number.new(5.0)
-      ]
-    ).execute(env)
+    result =
+      AST::FunctionCall.new(
+        AST::Identifier.new('do'),
+        [AST::Identifier.new('add_one'), AST::Number.new(5.0)]
+      )
+        .execute(env)
 
     expect(result).to eq(6)
   end

spec/ast/index_spec.rb

@@ -2,13 +2,12 @@ RSpec.describe AST::Index do
   it 'evaluates array index' do
     expect(
       AST::Index.new(
-        AST::Array.new([
-          AST::Number.new(1.0),
-          AST::Number.new(2.0),
-          AST::Number.new(3.0),
-        ]),
+        AST::Array.new(
+          [AST::Number.new(1.0), AST::Number.new(2.0), AST::Number.new(3.0)]
+        ),
         AST::Number.new(2.0)
-      ).execute(Environment.new)
+      )
+        .execute(Environment.new)
     ).to eq(3.0)
   end
 
@@ -16,73 +15,73 @@ RSpec.describe AST::Index do
     expect(
       AST::Index.new(
         AST::Hash.new(
-          :a => AST::Number.new(1.0),
-          :b => AST::Number.new(2.0),
-          :c => AST::Number.new(3.0),
+          a: AST::Number.new(1.0),
+          b: AST::Number.new(2.0),
+          c: AST::Number.new(3.0)
         ),
         AST::Atom.new(:b)
-      ).execute(Environment.new)
+      )
+        .execute(Environment.new)
     ).to eq(2.0)
   end
 
   it 'raises for out of bounds array index' do
     expect {
       AST::Index.new(
-        AST::Array.new([
-          AST::Number.new(1.0),
-          AST::Number.new(2.0),
-          AST::Number.new(3.0),
-        ]),
+        AST::Array.new(
+          [AST::Number.new(1.0), AST::Number.new(2.0), AST::Number.new(3.0)]
+        ),
         AST::Number.new(3.0)
-      ).execute(Environment.new)
-    }.to raise_error("Array index out of bounds")
+      )
+        .execute(Environment.new)
+    }.to raise_error('Array index out of bounds')
   end
 
   it 'raises for non-integral key on array' do
     expect {
       AST::Index.new(
-        AST::Array.new([
-          AST::Number.new(1.0),
-          AST::Number.new(2.0),
-          AST::Number.new(3.0),
-        ]),
+        AST::Array.new(
+          [AST::Number.new(1.0), AST::Number.new(2.0), AST::Number.new(3.0)]
+        ),
         AST::Number.new(1.5)
-      ).execute(Environment.new)
-    }.to raise_error("Array index requires integer key")
+      )
+        .execute(Environment.new)
+    }.to raise_error('Array index requires integer key')
 
     expect {
       AST::Index.new(
-        AST::Array.new([
-          AST::Number.new(1.0),
-          AST::Number.new(2.0),
-          AST::Number.new(3.0),
-        ]),
-        AST::String.new("5")
-      ).execute(Environment.new)
-    }.to raise_error("Array index requires integer key")
+        AST::Array.new(
+          [AST::Number.new(1.0), AST::Number.new(2.0), AST::Number.new(3.0)]
+        ),
+        AST::String.new('5')
+      )
+        .execute(Environment.new)
+    }.to raise_error('Array index requires integer key')
 
     expect {
       AST::Index.new(
-        AST::Array.new([
-          AST::Number.new(1.0),
-          AST::Number.new(2.0),
-          AST::Number.new(3.0),
-        ]),
+        AST::Array.new(
+          [AST::Number.new(1.0), AST::Number.new(2.0), AST::Number.new(3.0)]
+        ),
         AST::Atom.new(:atom)
-      ).execute(Environment.new)
-    }.to raise_error("Array index requires integer key")
+      )
+        .execute(Environment.new)
+    }.to raise_error('Array index requires integer key')
   end
 
   it 'raises for missing hash key' do
     expect {
       AST::Index.new(
-        AST::Hash.new({
-          :a => AST::Number.new(1.0),
-          :b => AST::Number.new(2.0),
-          :c => AST::Number.new(3.0),
-        }),
+        AST::Hash.new(
+          {
+            a: AST::Number.new(1.0),
+            b: AST::Number.new(2.0),
+            c: AST::Number.new(3.0)
+          }
+        ),
         AST::Atom.new(:d)
-      ).execute(Environment.new)
-    }.to raise_error("Key d does not exist on object")
+      )
+        .execute(Environment.new)
+    }.to raise_error('Key d does not exist on object')
   end
 end

spec/ast/variable_declaration_spec.rb

@@ -1,24 +1,21 @@
 RSpec.describe AST::VariableDeclaration do
   it 'defines a variable' do
     env = Environment.new
-    AST::VariableDeclaration.new(
-      AST::Identifier.new('x'),
-      AST::Number.new(5.0),
-    ).execute(env)
+    AST::VariableDeclaration.new(AST::Identifier.new('x'), AST::Number.new(5.0))
+      .execute(env)
     expect(env.get('x').execute(env)).to eq(5.0)
   end
 
   it 'raises if a variable is already defined' do
     env = Environment.new
-    AST::VariableDeclaration.new(
-      AST::Identifier.new('x'),
-      AST::Number.new(5.0),
-    ).execute(env)
+    AST::VariableDeclaration.new(AST::Identifier.new('x'), AST::Number.new(5.0))
+      .execute(env)
     expect {
       AST::VariableDeclaration.new(
         AST::Identifier.new('x'),
-        AST::Number.new(6.0),
-      ).execute(env)
+        AST::Number.new(6.0)
+      )
+        .execute(env)
     }.to raise_error('Invalid declaration of previously declared variable x')
   end
 end

spec/lexer_spec.rb

@@ -143,7 +143,7 @@ RSpec.describe Lexer do
       [
         Token.new(TokenKinds::FOR),
         Token.new(TokenKinds::IN),
-        Token.new(TokenKinds::EOF),
+        Token.new(TokenKinds::EOF)
       ]
     )
   end
@@ -152,7 +152,7 @@ RSpec.describe Lexer do
     expect(Lexer.new('"hello \"world\""').scan_all).to eq(
       [
         Token.new(TokenKinds::STRING, 'hello "world"'),
-        Token.new(TokenKinds::EOF),
+        Token.new(TokenKinds::EOF)
       ]
     )
   end
@@ -162,7 +162,7 @@ RSpec.describe Lexer do
       [
         Token.new(TokenKinds::STRING, "hello\nworld"),
         Token.new(TokenKinds::STRING, "hello\tworld"),
-        Token.new(TokenKinds::EOF),
+        Token.new(TokenKinds::EOF)
       ]
     )
   end
@@ -174,7 +174,7 @@ RSpec.describe Lexer do
         Token.new(TokenKinds::LPAREN),
         Token.new(TokenKinds::NUMBER, 5),
         Token.new(TokenKinds::RPAREN),
-        Token.new(TokenKinds::EOF),
+        Token.new(TokenKinds::EOF)
       ]
     )
   end

spec/parser_spec.rb

@@ -369,9 +369,7 @@ RSpec.describe Parser do
             [
               AST::FunctionCall.new(
                 AST::Identifier.new('print'),
-                [
-                  AST::Identifier.new('x')
-                ]
+                [AST::Identifier.new('x')]
               )
             ]
           )
@@ -393,7 +391,7 @@ RSpec.describe Parser do
                 AST::Binary.new(
                   AST::Operators::ADD,
                   AST::Identifier.new('x'),
-                  AST::Identifier.new('y'),
+                  AST::Identifier.new('y')
                 )
               ]
             )
@@ -404,7 +402,9 @@ RSpec.describe Parser do
   end
 
   it 'allows returning an anonymous function from another function' do
-    expect(parse('function outer() { function() { print("Hello world"); }; }')).to eq(
+    expect(
+      parse('function outer() { function() { print("Hello world"); }; }')
+    ).to eq(
       [
         AST::FunctionDefinition.new(
           AST::Identifier.new('outer'),
@@ -418,9 +418,7 @@ RSpec.describe Parser do
                   [
                     AST::FunctionCall.new(
                       AST::Identifier.new('print'),
-                      [
-                        AST::String.new('Hello world')
-                      ]
+                      [AST::String.new('Hello world')]
                     )
                   ]
                 )
@@ -432,7 +430,7 @@ RSpec.describe Parser do
     )
   end
 
-	it 'allows toplevel function expressions' do
+  it 'allows toplevel function expressions' do
     expect(parse('function() { print("Hello world"); };')).to eq(
       [
         AST::FunctionDefinition.new(
@@ -442,25 +440,18 @@ RSpec.describe Parser do
             [
               AST::FunctionCall.new(
                 AST::Identifier.new('print'),
-                [
-                  AST::String.new('Hello world')
-                ]
+                [AST::String.new('Hello world')]
               )
             ]
           )
         )
       ]
     )
-	end
+  end
 
   it 'parses assignments' do
     expect(parse('x = 5;')).to eq(
-      [
-        AST::Assignment.new(
-          AST::Identifier.new('x'),
-          AST::Number.new(5.0),
-        )
-      ]
+      [AST::Assignment.new(AST::Identifier.new('x'), AST::Number.new(5.0))]
     )
   end
 end