Refactor

lib/ahem/parser.rb

 
     class_methods = Array.new
     instance_methods = Array.new
-    while [TokenKinds::METHOD, TokenKinds::CLASSMETHOD].include?(@current_token.type)
+    while [TokenKinds::METHOD, TokenKinds::CLASSMETHOD].include?(
+      @current_token.type
+    )
       case @current_token.type
       when TokenKinds::METHOD
         instance_methods << method_definition
 
     eat(TokenKinds::RBRACE)
 
-    AST::ClassDefinition.new(class_name, property_declarations, instance_methods, class_methods)
+    AST::ClassDefinition.new(
+      class_name,
+      property_declarations,
+      instance_methods,
+      class_methods
+    )
   end
 
   def conditional
     left = comparison
 
     if @current_token.type == TokenKinds::OPERATOR
-      operator = @current_token.value
-      advance
+      operator = eat(TokenKinds::OPERATOR).value
       right = comparison
       AST::Binary.new(operator, left, right)
     else
   end
 
   def comparison
-    left = multiplication
+    left = addition
 
     if @current_token.type == TokenKinds::OPERATOR &&
        %i[< > <= >=].include?(@current_token.type)
-      operator = @current_token.value
-      advance
-      right = multiplication
+      operator = eat(TokenKinds::OPERATOR).value
+      right = addition
       AST::Binary.new(operator, left, right)
     else
       left
 
     if @current_token.type == TokenKinds::OPERATOR &&
        %i[+ -].include?(@current_token.value)
-      operator = @current_token.value
-      advance
+      operator = eat(TokenKinds::OPERATOR).value
       right = multiplication
       AST::Binary.new(operator, left, right)
     else
 
     if @current_token.type == TokenKinds::OPERATOR &&
        %i[* /].include?(@current_token.value)
-      operator = @current_token.value
-      advance
+      operator = eat(TokenKinds::OPERATOR).value
       right = unary
       AST::Binary.new(operator, left, right)
     else