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

Author: aNNiMON

build.gradle

@@ -36,6 +36,7 @@ task generateJavaSources() {
  def source = """
  package com.annimon.ownlang;
  class Gen {
+ private Gen() {}
  public static final String BUILD_DATE = "${new Date().format('YYMMdd')}";
  }
  """

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

@@ -50,9 +50,9 @@ public static void error(CharSequence value) {
  public static void handleException(Thread thread, Throwable throwable) {
  final ByteArrayOutputStream baos = new ByteArrayOutputStream();
  try(final PrintStream ps = new PrintStream(baos)) {
- ps.printf("%s in %s\n", throwable.getMessage(), thread.getName());
+ ps.printf("%s in %s%n", throwable.getMessage(), thread.getName());
  for (CallStack.CallInfo call : CallStack.getCalls()) {
- ps.printf("\tat %s\n", call);
+ ps.printf("\tat %s%n", call);
  }
  ps.println();
  throwable.printStackTrace(ps);
@@ -74,4 +74,6 @@ public static File fileInstance(String path) {
  }
  return new File(filepath);
  }
+
+
 }

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

@@ -33,25 +33,9 @@ public static String[] getOwnlangArgs() {
  public static void main(String[] args) throws IOException {
  if (args.length == 0) {
  try {
- final Options options = new Options();
- options.showAst = false;
- options.showTokens = false;
- options.showMeasurements = false;
- options.lintMode = false;
- options.optimizationLevel = 0;
- run(SourceLoader.readSource("program.own"), options);
+ runDefault();
  } catch (IOException ioe) {
- System.out.println("OwnLang version " + VERSION + "\n\n" +
- "Usage: ownlang [options]\n" +
- " options:\n" +
- " -f, --file [input] Run program file. Required.\n" +
- " -r, --repl Enter to a REPL mode\n" +
- " -l, --lint Find bugs in code\n" +
- " -o N, --optimize N Perform optimization with N passes\n" +
- " -b, --beautify Beautify source code\n" +
- " -a, --showast Show AST of program\n" +
- " -t, --showtokens Show lexical tokens\n" +
- " -m, --showtime Show elapsed time of parsing and execution");
+ printUsage();
  }
  return;
  }
@@ -139,6 +123,30 @@ public static void main(String[] args) throws IOException {
  run(input, options);
  }
 
+ private static void runDefault() throws IOException {
+ final Options options = new Options();
+ options.showAst = false;
+ options.showTokens = false;
+ options.showMeasurements = false;
+ options.lintMode = false;
+ options.optimizationLevel = 0;
+ run(SourceLoader.readSource("program.own"), options);
+ }
+
+ private static void printUsage() {
+ System.out.println("OwnLang version " + VERSION + "\n\n" +
+ "Usage: ownlang [options]\n" +
+ " options:\n" +
+ " -f, --file [input] Run program file. Required.\n" +
+ " -r, --repl Enter to a REPL mode\n" +
+ " -l, --lint Find bugs in code\n" +
+ " -o N, --optimize N Perform optimization with N passes\n" +
+ " -b, --beautify Beautify source code\n" +
+ " -a, --showast Show AST of program\n" +
+ " -t, --showtokens Show lexical tokens\n" +
+ " -m, --showtime Show elapsed time of parsing and execution");
+ }
+
  private static void createOwnLangArgs(String[] javaArgs, int index) {
  if (index >= javaArgs.length) return;
  ownlangArgs = new String[javaArgs.length - index];
@@ -152,7 +160,8 @@ private static void run(String input, Options options) {
  final List<Token> tokens = Lexer.tokenize(input);
  measurement.stop("Tokenize time");
  if (options.showTokens) {
- for (int i = 0; i < tokens.size(); i++) {
+ final int tokensCount = tokens.size();
+ for (int i = 0; i < tokensCount; i++) {
  System.out.println(i + " " + tokens.get(i));
  }
  }
@@ -205,16 +214,16 @@ private static class Options {
  boolean lintMode;
  int optimizationLevel;
 
- public Options() {
+ Options() {
  showTokens = false;
  showAst = false;
  showMeasurements = false;
  lintMode = false;
  optimizationLevel = 0;
  }
 
- public void validate() {
- if (lintMode == true) {
+ void validate() {
+ if (lintMode) {
  showTokens = false;
  showAst = false;
  showMeasurements = false;

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

@@ -4,6 +4,8 @@
 
 public final class Arguments {
 
+ private Arguments() { }
+
  public static void check(int expected, int got) {
  if (got != expected) throw new ArgumentsMismatchException(String.format(
  "%d %s expected, got %d", expected, pluralize(expected), got));

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

@@ -5,7 +5,9 @@
 
 public final class CallStack {
 
- private static final Deque<CallInfo> calls = new ConcurrentLinkedDeque<CallInfo>();;
+ private static final Deque<CallInfo> calls = new ConcurrentLinkedDeque<>();
+
+ private CallStack() { }
 
  public static synchronized void clear() {
  calls.clear();

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

@@ -15,6 +15,8 @@ public final class Functions {
  functions = new HashMap<>();
  }
 
+ private Functions() { }
+
  public static void clear() {
  functions.clear();
  }

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

@@ -6,10 +6,15 @@
  */
 public final class NumberValue implements Value {
 
- public static final NumberValue MINUS_ONE, ZERO, ONE;
+ private static final int CACHE_MIN = -128;
+ private static final int CACHE_MAX = 127;
+
+ public static final NumberValue MINUS_ONE;
+ public static final NumberValue ZERO;
+ public static final NumberValue ONE;
 
- private static final int CACHE_MIN = -128, CACHE_MAX = 127;
  private static final NumberValue[] NUMBER_CACHE;
+
  static {
  final int length = CACHE_MAX - CACHE_MIN + 1;
  NUMBER_CACHE = new NumberValue[length];

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

@@ -10,7 +10,8 @@ public final class Types {
  MAP = 4,
  FUNCTION = 5;
 
- private static final int FIRST = OBJECT, LAST = FUNCTION;
+ private static final int FIRST = OBJECT;
+ private static final int LAST = FUNCTION;
  private static final String[] NAMES = {"object", "number", "string", "array", "map", "function"};
 
  public static String typeToString(int type) {
@@ -19,4 +20,6 @@ public static String typeToString(int type) {
  }
  return "unknown (" + type + ")";
  }
+
+ private Types() { }
 }

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

@@ -8,6 +8,8 @@
 
 public final class ValueUtils {
 
+ private ValueUtils() { }
+
  public static Object toObject(Value val) {
  switch (val.type()) {
  case Types.ARRAY:
@@ -101,7 +103,7 @@ public static byte[] toByteArray(ArrayValue array) {
  return result;
  }
 
- public static Function consumeFunction(Value value, int argumentNumber) throws TypeException {
+ public static Function consumeFunction(Value value, int argumentNumber) {
  final int type = value.type();
  if (type != Types.FUNCTION) {
  throw new TypeException("Function expected at argument " + (argumentNumber + 1)

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

@@ -35,6 +35,8 @@ private static class ScopeFindData {
  Variables.clear();
  }
 
+ private Variables() { }
+
  public static Map<String, Value> variables() {
  return scope.variables;
  }