cleanup code

capybara-team · Nov 18, 2020 · bf14e4c · bf14e4c
1 parent c8fa6cb
commit bf14e4c
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 42 deletions.
diff --git a/src/main/java/lexlang/ArrayValue.java b/src/main/java/lexlang/ArrayValue.java
@@ -1,4 +1,4 @@
-/**
+/*
  Maxwell Souza 201435009
  Rodolpho Rossete 201435032
  */
@@ -45,7 +45,7 @@ public boolean add(Value value) {
         return values.add(value);
     }
 
-    private void checkIndexBounds(int i){
+    private void checkIndexBounds(int i) {
         if (values.size() <= i)
             throw new LangException("Index " + i + " out of bounds for length " + values.size());
     }

diff --git a/src/main/java/lexlang/Data.java b/src/main/java/lexlang/Data.java
@@ -1,4 +1,4 @@
-/**
+/*
  Maxwell Souza 201435009
  Rodolpho Rossete 201435032
  */

diff --git a/src/main/java/lexlang/FunctionScope.java b/src/main/java/lexlang/FunctionScope.java
@@ -1,4 +1,4 @@
-/**
+/*
  Maxwell Souza 201435009
  Rodolpho Rossete 201435032
  */

diff --git a/src/main/java/lexlang/LangInterpreter.java b/src/main/java/lexlang/LangInterpreter.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 
@@ -36,9 +36,8 @@ public LangInterpreter(SemanticAnalyzer analyzer) {
     /**
      * Run a program
      */
-    public Value run() {
+    public void run() {
         runFunction("main", null);
-        return null;
     }
 
     // Memory management
@@ -387,7 +386,7 @@ public Value visitReadCmd(LexLangParser.ReadCmdContext ctx) {
         String response = reader.nextLine();
         int val;
         try {
-            val = Integer.valueOf(response);
+            val = Integer.parseInt(response);
         } catch (Exception e) {
             throw new LangException("Read error: 'Int' expected, received '" + response + "'", ctx);
         }

diff --git a/src/main/java/lexlang/LangRunner.java b/src/main/java/lexlang/LangRunner.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 

diff --git a/src/main/java/lexlang/Main.java b/src/main/java/lexlang/Main.java
@@ -1,4 +1,4 @@
-/**
+/*
  Maxwell Souza 201435009
  Rodolpho Rossete 201435032
  */

diff --git a/src/main/java/lexlang/Scope.java b/src/main/java/lexlang/Scope.java
@@ -1,4 +1,4 @@
-/**
+/*
  Maxwell Souza 201435009
  Rodolpho Rossete 201435032
  */

diff --git a/src/main/java/lexlang/Value.java b/src/main/java/lexlang/Value.java
@@ -1,17 +1,16 @@
-/**
+/*
  Maxwell Souza 201435009
  Rodolpho Rossete 201435032
  */
 
 
-
 package lexlang;
 
 public class Value {
     final Object primitive;
 
     public static Value VOID = new Value(null);
-    public static Value EMPTY_CHAR = new Value((Character)Character.MIN_VALUE);
+    public static Value EMPTY_CHAR = new Value(Character.MIN_VALUE);
 
     public Value(Object value) {
         this.primitive = value;
@@ -44,14 +43,15 @@ public Data getData() {
         return (Data) primitive;
     }
 
-    public ArrayValue getArray(){
+    public ArrayValue getArray() {
         return (ArrayValue) primitive;
     }
 
     @Override
     public boolean equals(Object o) {
         if (primitive == o) return true;
-//      if (value == null || o == null || o.getClass() != value.getClass()) return false;
+        // if (value == null || o == null || o.getClass() != value.getClass()) return false;
+        if (!(o instanceof Value)) return false;
         Value comparedValue = (Value) o;
         if (comparedValue.getRawValue() instanceof Number && this.primitive instanceof Number)
             return this.getFloat().equals(comparedValue.getFloat());

diff --git a/src/main/java/semantics/DataDeclaration.java b/src/main/java/semantics/DataDeclaration.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 

diff --git a/src/main/java/semantics/DefaultTypes.java b/src/main/java/semantics/DefaultTypes.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 package semantics;

diff --git a/src/main/java/semantics/FunctionDeclaration.java b/src/main/java/semantics/FunctionDeclaration.java
@@ -1,13 +1,12 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 
 package semantics;
 
 import lexlang.LexLangParser;
-import semantics.Type;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/semantics/FunctionManager.java b/src/main/java/semantics/FunctionManager.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 package semantics;

diff --git a/src/main/java/semantics/LangException.java b/src/main/java/semantics/LangException.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 

diff --git a/src/main/java/semantics/Type.java b/src/main/java/semantics/Type.java
@@ -76,9 +76,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        String arrayDepth = "";
-        for (int i = 0; i < depth; i++) arrayDepth += "[]";
+        StringBuilder arrayDepth = new StringBuilder();
+        for (int i = 0; i < depth; i++) arrayDepth.append("[]");
         if (isData()) return data.getId() + arrayDepth;
-        return type + arrayDepth;
+        return type + arrayDepth.toString();
     }
 }
diff --git a/src/main/java/semantics/Validator.java b/src/main/java/semantics/Validator.java
@@ -1,6 +1,6 @@
-/**
- * Maxwell Souza 201435009
- * Rodolpho Rossete 201435032
+/*
+  Maxwell Souza 201435009
+  Rodolpho Rossete 201435032
  */
 
 package semantics;