Незначительные исправления

Author: aNNiMON

README.md

@@ -1,6 +1,8 @@
 # OwnLang
 
 [![Build Status](https://travis-ci.org/aNNiMON/Own-Programming-Language-Tutorial.svg?branch=latest)](https://travis-ci.org/aNNiMON/Own-Programming-Language-Tutorial)
+[![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=aNNiMON_Own-Programming-Language-Tutorial&metric=alert_status)](https://sonarcloud.io/dashboard?id=aNNiMON_Own-Programming-Language-Tutorial)
+[![SonarCloud Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=aNNiMON_Own-Programming-Language-Tutorial&metric=sqale_rating)](https://sonarcloud.io/dashboard/?id=aNNiMON_Own-Programming-Language-Tutorial)
 
 | Free | Pro | Desktop |
 | :--: | :-: | :-----: |

src/main/java/com/annimon/ownlang/Console.java

@@ -9,7 +9,11 @@
 public class Console {
 
     private static final String FILE_PREFIX = "tmp/";
-    public static boolean filePrefixEnabled = false;
+    private static boolean filePrefixEnabled;
+
+    public static void enableFilePrefix() {
+        Console.filePrefixEnabled = true;
+    }
 
     public static String newline() {
         return System.lineSeparator();

src/main/java/com/annimon/ownlang/lib/Variables.java

@@ -12,22 +12,22 @@ public final class Variables {
     private static final Object lock = new Object();
 
     private static class Scope {
-        public final Scope parent;
-        public final Map<String, Value> variables;
+        final Scope parent;
+        final Map<String, Value> variables;
 
-        public Scope() {
+        Scope() {
             this(null);
         }
 
-        public Scope(Scope parent) {
+        Scope(Scope parent) {
             this.parent = parent;
             variables = new ConcurrentHashMap<>();
         }
     }
 
     private static class ScopeFindData {
-        public boolean isFound;
-        public Scope scope;
+        boolean isFound;
+        Scope scope;
     }
 
     private static volatile Scope scope;
@@ -46,14 +46,13 @@ public static void clear() {
         scope.variables.put("false", NumberValue.ZERO);
     }
 
-    public static void push() {
+    static void push() {
         synchronized (lock) {
-            final Scope newScope = new Scope(scope);
-            scope = newScope;
+            scope = new Scope(scope);
         }
     }
 
-    public static void pop() {
+    static void pop() {
         synchronized (lock) {
             if (scope.parent != null) {
                 scope = scope.parent;

src/main/java/com/annimon/ownlang/modules/java/java.java

@@ -319,9 +319,14 @@ private static boolean isMatch(Value[] args, Class<?>[] types) {
             final Class<?> clazz = types[i];
 
             if (arg == NULL) continue;
-            if (unboxed(clazz).isAssignableFrom(unboxed(valueToObject(arg).getClass()))) {
-                continue;
-            }
+
+            final Class<?> unboxed = unboxed(clazz);
+            boolean assignable = unboxed != null;
+            final Object object = valueToObject(arg);
+            assignable = assignable && (object != null);
+            assignable = assignable && (unboxed.isAssignableFrom(object.getClass()));
+            if (assignable) continue;
+
             return false;
         }
         return true;

src/main/java/com/annimon/ownlang/modules/robot/robot_exec.java

@@ -1,5 +1,6 @@
 package com.annimon.ownlang.modules.robot;
 
+import com.annimon.ownlang.Console;
 import com.annimon.ownlang.lib.Arguments;
 import com.annimon.ownlang.lib.ArrayValue;
 import com.annimon.ownlang.lib.Function;
@@ -43,7 +44,6 @@ public Value execute(Value... args) {
                     return NumberValue.ZERO;
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
             return NumberValue.ZERO;
         }
     }

src/main/java/com/annimon/ownlang/modules/std/std_sync.java

@@ -29,6 +29,7 @@ public Value execute(Value... args) {
         try {
             return queue.take();
         } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
             throw new RuntimeException(ex);
         }
     }

src/main/java/com/annimon/ownlang/parser/Parser.java

@@ -30,7 +30,7 @@ public static Statement parse(List<Token> tokens) {
 
     private static final EnumMap<TokenType, BinaryExpression.Operator> ASSIGN_OPERATORS;
     static {
-        ASSIGN_OPERATORS = new EnumMap(TokenType.class);
+        ASSIGN_OPERATORS = new EnumMap<>(TokenType.class);
         ASSIGN_OPERATORS.put(TokenType.EQ, null);
         ASSIGN_OPERATORS.put(TokenType.PLUSEQ, BinaryExpression.Operator.ADD);
         ASSIGN_OPERATORS.put(TokenType.MINUSEQ, BinaryExpression.Operator.SUBTRACT);
@@ -305,7 +305,7 @@ private Expression functionChain(Expression qualifiedNameExpr) {
         }
         if (lookMatch(0, TokenType.DOT)) {
             final List<Expression> indices = variableSuffix();
-            if (indices == null | indices.isEmpty()) return expr;
+            if (indices == null || indices.isEmpty()) return expr;
 
             if (lookMatch(0, TokenType.LPAREN)) {
                 // next function call

src/main/java/com/annimon/ownlang/parser/ast/MatchExpression.java

@@ -221,7 +221,7 @@ public String toString() {
     }
 
     public static class ConstantPattern extends Pattern {
-        public Value constant;
+        Value constant;
 
         public ConstantPattern(Value pattern) {
             this.constant = pattern;
@@ -247,13 +247,13 @@ public String toString() {
     }
 
     public static class ListPattern extends Pattern {
-        public List<String> parts;
+        List<String> parts;
 
         public ListPattern() {
             this(new ArrayList<>());
         }
 
-        public ListPattern(List<String> parts) {
+        ListPattern(List<String> parts) {
             this.parts = parts;
         }
 

src/main/java/com/annimon/ownlang/parser/optimization/VariableInfo.java

@@ -4,7 +4,7 @@
 
 public final class VariableInfo {
     public Value value;
-    public int modifications;
+    int modifications;
 
     @Override
     public String toString() {

src/main/java/com/annimon/ownlang/utils/Sandbox.java

@@ -18,7 +18,7 @@
 public final class Sandbox {
 
     public static void main(String[] args) throws IOException {
-        Console.filePrefixEnabled = true;
+        Console.enableFilePrefix();
         final String input = SourceLoader.readAndCloseStream(System.in);
         dumpInputArguments(input, args);