From 00da3cd2f18f7ec42e16497cc72f055f5977a8a8 Mon Sep 17 00:00:00 2001
From: Dave Holoway <adelphes@gmail.com>
Date: Mon, 29 Jun 2020 16:24:01 +0100
Subject: [PATCH] move addproblem into TokenList

---
 langserver/java/TokenList.js   | 11 ++++++++++-
 langserver/java/body-parser.js | 12 +-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/langserver/java/TokenList.js b/langserver/java/TokenList.js
index 2bc8f91..0120693 100644
--- a/langserver/java/TokenList.js
+++ b/langserver/java/TokenList.js
@@ -3,6 +3,15 @@
  */
 const ParseProblem = require('./parsetypes/parse-problem');
 
+/**
+ * 
+ * @param {TokenList} tokens 
+ * @param {ParseProblem} problem 
+ */
+function addproblem(tokens, problem) {
+    tokens.problems.push(problem);
+}
+
 class TokenList {
     /**
      * @param {Token[]} tokens
@@ -136,7 +145,6 @@ class TokenList {
             return true;
         }
         const token = this.current || this.tokens[this.tokens.length - 1];
-        const addproblem = require("./body-parser").addproblem;
         addproblem(this, ParseProblem.Error(token, `${value} expected`));
         return false;
     }
@@ -164,3 +172,4 @@ class TokenList {
 }
 
 exports.TokenList = TokenList;
+exports.addproblem = addproblem;
diff --git a/langserver/java/body-parser.js b/langserver/java/body-parser.js
index 333ee72..9d5543c 100644
--- a/langserver/java/body-parser.js
+++ b/langserver/java/body-parser.js
@@ -12,7 +12,7 @@ const ParseProblem = require('./parsetypes/parse-problem');
 const { tokenize, Token } = require('./tokenizer');
 const { resolveTypeOrPackage, resolveNextTypeOrPackage } = require('./type-resolver');
 const { genericTypeArgs, typeIdent, typeIdentList } = require('./typeident');
-const { TokenList } = require("./TokenList");
+const { TokenList, addproblem } = require("./TokenList");
 const { AnyMethod, AnyType, AnyValue } = require("./anys");
 const { Label, Local, MethodDeclarations, ResolvedIdent } = require("./body-types");
 const { resolveImports, resolveSingleImport } = require('./import-resolver');
@@ -104,7 +104,6 @@ function parseBody(method, imports, typemap) {
         checkStatementBlock(block, method, typemap, tokenlist.problems);
     } catch (err) {
         addproblem(tokenlist, ParseProblem.Information(tokenlist.current, `Parse failed: ${err.message}`));
-
     }
     return {
         block,
@@ -112,15 +111,6 @@ function parseBody(method, imports, typemap) {
     }
 }
 
-/**
- * 
- * @param {TokenList} tokens 
- * @param {ParseProblem} problem 
- */
-function addproblem(tokens, problem) {
-    tokens.problems.push(problem);
-}
-
 /**
  * @param {TokenList} tokens 
  * @param {*} typemap