From 9be298293f17645c54f5f49b2dfc8f31f6001ffd Mon Sep 17 00:00:00 2001
From: Dave Holoway <adelphes@gmail.com>
Date: Thu, 18 Jun 2020 17:22:17 +0100
Subject: [PATCH] rename ResolvedType  to ResolvedValue

---
 langserver/java/anys.js                           | 6 +++---
 langserver/java/body-types.js                     | 4 ++--
 langserver/java/expression-resolver.js            | 6 +++---
 langserver/java/expressiontypes/CastExpression.js | 4 ++--
 langserver/java/expressiontypes/Expression.js     | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/langserver/java/anys.js b/langserver/java/anys.js
index 7b23800..8a80610 100644
--- a/langserver/java/anys.js
+++ b/langserver/java/anys.js
@@ -107,7 +107,7 @@ class TypeIdentType {
  */
 class ArrayValueType {
     /**
-     * @param {{tokens:Token[], value: ResolvedType}[]} elements
+     * @param {{tokens:Token[], value: ResolvedValue}[]} elements
      */
     constructor(elements) {
         this.elements = elements;
@@ -122,7 +122,7 @@ class ArrayValueType {
  */
 class MultiValueType {
     /**
-     * @param {ResolvedType[]} types
+     * @param {ResolvedValue[]} types
      */
     constructor(...types) {
         this.types = types;
@@ -130,7 +130,7 @@ class MultiValueType {
 }
 
 /**
- * @typedef {JavaType|MethodType|LambdaType|ArrayValueType|TypeIdentType|MultiValueType} ResolvedType
+ * @typedef {JavaType|MethodType|LambdaType|ArrayValueType|TypeIdentType|MultiValueType} ResolvedValue
  **/
 
 exports.AnyMethod = AnyMethod;
diff --git a/langserver/java/body-types.js b/langserver/java/body-types.js
index a5ad053..f6a3272 100644
--- a/langserver/java/body-types.js
+++ b/langserver/java/body-types.js
@@ -1,6 +1,6 @@
 /**
  * @typedef {import('./expressiontypes/Expression').Expression} Expression
- * @typedef {import('./anys').ResolvedType} ResolvedType
+ * @typedef {import('./anys').ResolvedValue} ResolvedValue
  */
 const { JavaType, CEIType, ArrayType, Method } = require('java-mti');
 const { Token } = require('./tokenizer');
@@ -28,7 +28,7 @@ class ResolvedIdent {
 
     /**
      * @param {ResolveInfo} ri 
-     * @returns {ResolvedType}
+     * @returns {ResolvedValue}
      */
     resolveExpression(ri) {
         if (this.variables[0]) {
diff --git a/langserver/java/expression-resolver.js b/langserver/java/expression-resolver.js
index f2db082..5916697 100644
--- a/langserver/java/expression-resolver.js
+++ b/langserver/java/expression-resolver.js
@@ -1,6 +1,6 @@
 /**
  * @typedef {import('./tokenizer').Token} Token
- * @typedef {import('./anys').ResolvedType} ResolvedType
+ * @typedef {import('./anys').ResolvedValue} ResolvedValue
  * @typedef {import('./body-types').ResolvedIdent} ResolvedIdent
  */
 const ParseProblem = require('./parsetypes/parse-problem');
@@ -44,7 +44,7 @@ function checkAssignment(e, assign_type, typemap, problems) {
 /**
  * 
  * @param {JavaType} variable_type 
- * @param {import('./anys').ResolvedType} value_type 
+ * @param {ResolvedValue} value_type 
  * @param {() => Token|Token[]} tokens
  * @param {ParseProblem[]} problems
  */
@@ -100,7 +100,7 @@ function checkArrayLiteral(variable_type, value_type, tokens, problems) {
 
     /**
      * @param {JavaType} element_type 
-     * @param {ResolvedType} value_type 
+     * @param {ResolvedValue} value_type 
      * @param {Token[]} tokens
      */
     function checkArrayElement(element_type, value_type, tokens) {
diff --git a/langserver/java/expressiontypes/CastExpression.js b/langserver/java/expressiontypes/CastExpression.js
index e01cdfe..7ace94c 100644
--- a/langserver/java/expressiontypes/CastExpression.js
+++ b/langserver/java/expressiontypes/CastExpression.js
@@ -1,7 +1,7 @@
 /**
  * @typedef {import('../body-types').ResolvedIdent} ResolvedIdent
  * @typedef {import('../body-types').ResolveInfo} ResolveInfo
- * @typedef {import('../anys').ResolvedType} ResolvedType
+ * @typedef {import('../anys').ResolvedValue} ResolvedValue
  */
 const { Expression } = require("./Expression");
 const { AnyType, TypeIdentType } = require('../anys');
@@ -45,7 +45,7 @@ class CastExpression extends Expression {
 /**
  * @param {CastExpression} cast
  * @param {JavaType} cast_type 
- * @param {ResolvedType} expr_type 
+ * @param {ResolvedValue} expr_type 
  * @param {ParseProblem[]} problems 
  */
 function checkCastable(cast, cast_type, expr_type, problems) {
diff --git a/langserver/java/expressiontypes/Expression.js b/langserver/java/expressiontypes/Expression.js
index b58a570..5e879fb 100644
--- a/langserver/java/expressiontypes/Expression.js
+++ b/langserver/java/expressiontypes/Expression.js
@@ -3,14 +3,14 @@
  * @typedef {import('java-mti').CEIType} CEIType
  * @typedef {import('../tokenizer').Token} Token
  * @typedef {import('../body-types').ResolveInfo} ResolveInfo
- * @typedef {import('../anys').ResolvedType} ResolvedType
+ * @typedef {import('../anys').ResolvedValue} ResolvedValue
   */
 
 class Expression {
 
     /**
      * @param {ResolveInfo} ri 
-     * @returns {ResolvedType}
+     * @returns {ResolvedValue}
      */
     resolveExpression(ri) {
         throw new Error('Expression.resolveType');