@eagleoutice/flowr 1.4.1 → 1.5.0

package/r-bridge/lang-4.x/ast/parser/json/parser.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPreparedParsedData = exports.normalize = exports.parseLog = void 0;
+const xml_1 = require("../xml");
+const model_1 = require("../../model");
+const objects_1 = require("../../../../../util/objects");
+const format_1 = require("./format");
+const internal_1 = require("../xml/internal");
+const log_1 = require("../../../../../util/log");
+exports.parseLog = log_1.log.getSubLogger({ name: 'ast-parser' });
+function normalize(jsonString, hooks, getId = (0, model_1.deterministicCountingIdGenerator)(0)) {
+    const hooksWithDefaults = (0, objects_1.deepMergeObject)(xml_1.DEFAULT_PARSER_HOOKS, hooks);
+    const data = { hooks: hooksWithDefaults, currentRange: undefined, currentLexeme: undefined };
+    const object = convertPreparedParsedData((0, format_1.prepareParsedData)(jsonString));
+    return (0, model_1.decorateAst)((0, internal_1.parseRootObjToAst)(data, object), getId);
+}
+exports.normalize = normalize;
+function convertPreparedParsedData(valueMapping) {
+    const exprlist = {};
+    exprlist[xml_1.nameKey] = 'exprlist';
+    const children = [];
+    for (const entry of valueMapping.values()) {
+        if (entry.parent == format_1.RootId) {
+            children.push(convertEntry(entry));
+        }
+    }
+    exprlist[xml_1.childrenKey] = children;
+    return { 'exprlist': exprlist };
+}
+exports.convertPreparedParsedData = convertPreparedParsedData;
+function convertEntry(csvEntry) {
+    const xmlEntry = {};
+    xmlEntry[xml_1.attributesKey] = {
+        'line1': csvEntry.line1,
+        'col1': csvEntry.col1,
+        'line2': csvEntry.line2,
+        'col2': csvEntry.col2
+    };
+    xmlEntry[xml_1.nameKey] = csvEntry.token;
+    if (csvEntry.text) {
+        xmlEntry[xml_1.contentKey] = csvEntry.text;
+    }
+    // check and recursively iterate children
+    if (csvEntry.children && csvEntry.children.length > 0) {
+        xmlEntry[xml_1.childrenKey] = csvEntry.children
+            // we sort children the same way xmlparsedata does (by line, by column, by inverse end line, by inverse end column, by terminal state, by combined "start" tiebreaker value)
+            // (https://github.com/r-lib/xmlparsedata/blob/main/R/package.R#L153C72-L153C78)
+            .sort((c1, c2) => c1.line1 - c2.line1 || c1.col1 - c2.col1 || c2.line2 - c1.line2 || c2.col2 - c1.col2 || Number(c1.terminal) - Number(c2.terminal) || sortTiebreak(c1) - sortTiebreak(c2))
+            .map(convertEntry);
+    }
+    return xmlEntry;
+}
+function sortTiebreak(entry) {
+    // see https://github.com/r-lib/xmlparsedata/blob/main/R/package.R#L110C5-L110C11
+    return entry.line1 * (Math.max(entry.col1, entry.col2) + 1) + entry.col1;
+}
+//# sourceMappingURL=parser.js.map

package/r-bridge/lang-4.x/ast/parser/xml/data.d.ts

@@ -1,14 +1,11 @@
 import type { MergeableRecord } from '../../../../../util/objects';
 import type { DeepReadonly } from 'ts-essentials';
-import type { XmlParserConfig } from './config';
 import type { XmlParserHooks } from './hooks';
 import type { SourceRange } from '../../../../../util/range';
 /**
  * Contains all information populated and present during parsing and normalization of the R AST.
  */
 export interface ParserData extends MergeableRecord {
-    /** @see XmlParserConfig */
-    readonly config: DeepReadonly<XmlParserConfig>;
     /** @see XmlParserHooks */
     readonly hooks: DeepReadonly<XmlParserHooks>;
     /**

package/r-bridge/lang-4.x/ast/parser/xml/index.d.ts

@@ -1,5 +1,3 @@
 export * from './data';
 export * from './hooks';
-export * from './config';
-export * from './parser';
 export * from './input-format';

package/r-bridge/lang-4.x/ast/parser/xml/index.js

@@ -16,7 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./data"), exports);
 __exportStar(require("./hooks"), exports);
-__exportStar(require("./config"), exports);
-__exportStar(require("./parser"), exports);
 __exportStar(require("./input-format"), exports);
 //# sourceMappingURL=index.js.map

package/r-bridge/lang-4.x/ast/parser/xml/input-format.d.ts

@@ -1,4 +1,8 @@
 import type { RawRType } from '../../model';
+export declare const attributesKey = "a";
+export declare const childrenKey = "c";
+export declare const contentKey = "@";
+export declare const nameKey = "#";
 /**
  * Thrown if the given input xml is not valid/contains unexpected elements.
  */
@@ -29,4 +33,4 @@ export interface NamedXmlBasedJson {
  * @typeParam T - the type of the values to retrieve. Note, that this type is not checked at runtime.
  */
 export declare function getKeysGuarded<T extends XmlBasedJsonValue>(obj: XmlBasedJson, key: string): T;
-export declare function getKeysGuarded<T extends XmlBasedJsonValue>(obj: XmlBasedJson, ...key: string[]): Record<string, T>;
+export declare function getKeysGuarded<T extends XmlBasedJsonValue>(obj: XmlBasedJson, ...key: readonly string[]): Record<string, T>;

package/r-bridge/lang-4.x/ast/parser/xml/input-format.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKeysGuarded = exports.XmlParseError = void 0;
+exports.getKeysGuarded = exports.XmlParseError = exports.nameKey = exports.contentKey = exports.childrenKey = exports.attributesKey = void 0;
+exports.attributesKey = 'a';
+exports.childrenKey = 'c';
+exports.contentKey = '@';
+exports.nameKey = '#';
 /**
  * Thrown if the given input xml is not valid/contains unexpected elements.
  */
@@ -12,19 +16,12 @@ class XmlParseError extends Error {
 }
 exports.XmlParseError = XmlParseError;
 function getKeysGuarded(obj, ...key) {
-    const keys = Object.keys(obj);
-    const check = (key) => {
-        if (!keys.includes(key)) {
-            throw new XmlParseError(`expected obj to have key ${key}, yet received ${JSON.stringify(obj)}`);
-        }
-        return obj[key];
-    };
     if (key.length === 1) {
-        return check(key[0]);
+        return obj[key[0]];
     }
     else {
         return key.reduce((acc, key) => {
-            acc[key] = check(key);
+            acc[key] = obj[key];
             return acc;
         }, {});
     }

package/r-bridge/lang-4.x/ast/parser/xml/internal/access.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeAccess = void 0;
 const meta_1 = require("./meta");
-const parser_1 = require("../parser");
 const hooks_1 = require("../hooks");
 const structure_1 = require("./structure");
 const assert_1 = require("../../../../../../util/assert");
 const arrays_1 = require("../../../../../../util/arrays");
 const argument_1 = require("./functions/argument");
+const parser_1 = require("../../json/parser");
 /**
  * Tries to normalize the given data as access (e.g., indexing).
  *
@@ -75,7 +75,7 @@ function tryNormalizeAccess(data, mappedWithName) {
         (0, assert_1.guard)(first !== null && (first.type === "RSymbol" /* RType.Symbol */ || first.type === "RString" /* RType.String */ || first.type === "RLogical" /* RType.Logical */), () => `${JSON.stringify(operator)} requires one symbol, yet received ${JSON.stringify(parsedAccess)}`);
         resultingAccess = first.type === "RString" /* RType.String */ ? first.content.str : first.lexeme;
     }
-    const { content, location } = (0, meta_1.retrieveMetaStructure)(data.config, accessOp.content);
+    const { content, location } = (0, meta_1.retrieveMetaStructure)(accessOp.content);
     const result = {
         type: "RAccess" /* RType.Access */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/control/if-then-else.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeIfThenElse = void 0;
 const structure_1 = require("../structure");
-const parser_1 = require("../../parser");
 const if_then_1 = require("./if-then");
 const assert_1 = require("../../../../../../../util/assert");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
+const parser_1 = require("../../../json/parser");
 /**
  * Try to parse the construct as a {@link RIfThenElse}.
  */

package/r-bridge/lang-4.x/ast/parser/xml/internal/control/if-then.js

@@ -4,8 +4,8 @@ exports.tryNormalizeIfThen = void 0;
 const input_format_1 = require("../../input-format");
 const structure_1 = require("../structure");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Try to parse the construct as a {@link RIfThenElse}.
  */
@@ -27,7 +27,7 @@ function tryNormalizeIfThen(data, tokens) {
     if (parsedCondition.type === "RDelimiter" /* RType.Delimiter */ || parsedThen.type === "RDelimiter" /* RType.Delimiter */) {
         throw new input_format_1.XmlParseError(`unexpected missing parts of if, received ${JSON.stringify([parsedCondition, parsedThen])} for ${JSON.stringify(tokens)}`);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, tokens[0].content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(tokens[0].content);
     const result = {
         type: "RIfThenElse" /* RType.IfThenElse */,
         condition: parsedCondition,

package/r-bridge/lang-4.x/ast/parser/xml/internal/expression/expression.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeExpression = void 0;
 const input_format_1 = require("../../input-format");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const structure_1 = require("../structure");
 const functions_1 = require("../functions");
 const hooks_1 = require("../../hooks");
 const access_1 = require("../access");
 const other_1 = require("../other");
 const arrays_1 = require("../../../../../../../util/arrays");
+const parser_1 = require("../../../json/parser");
 /**
  * Returns an expression list if there are multiple children, otherwise returns the single child directly with no expr wrapper
  *
@@ -19,9 +19,9 @@ const arrays_1 = require("../../../../../../../util/arrays");
 function normalizeExpression(data, obj) {
     parser_1.parseLog.debug('Parsing expr');
     obj = (0, hooks_1.executeHook)(data.hooks.expression.onExpression.before, data, obj);
-    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
-    const childrenSource = (0, input_format_1.getKeysGuarded)(unwrappedObj, data.config.childrenName);
-    const typed = (0, meta_1.getWithTokenType)(data.config.tokenMap, childrenSource);
+    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(obj);
+    const childrenSource = (0, input_format_1.getKeysGuarded)(unwrappedObj, input_format_1.childrenKey);
+    const typed = (0, meta_1.getWithTokenType)(childrenSource);
     const { others, comments } = (0, structure_1.splitComments)(typed);
     const childData = { ...data, currentRange: location, currentLexeme: content };
     const maybeFunctionCall = (0, functions_1.tryNormalizeFunctionCall)(childData, others);

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/argument.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryToNormalizeArgument = void 0;
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const hooks_1 = require("../../hooks");
 const log_1 = require("../../../../../../../util/log");
 const assert_1 = require("../../../../../../../util/assert");
 const structure_1 = require("../structure");
+const parser_1 = require("../../../json/parser");
 /**
  * Either parses `[expr]` or `[SYMBOL_SUB, EQ_SUB, expr]` as an argument of a function call in R.
  * Probably directly called by the function call parser as otherwise, we do not expect to find arguments.
@@ -24,7 +24,7 @@ function tryToNormalizeArgument(data, objs) {
         return (0, hooks_1.executeUnknownHook)(data.hooks.functions.onArgument.unknown, data, objs);
     }
     const symbolOrExpr = objs[0];
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, symbolOrExpr.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(symbolOrExpr.content);
     let parsedValue;
     let name;
     if (symbolOrExpr.name === "expr" /* RawRType.Expression */) {

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/call.js

@@ -5,11 +5,11 @@ const input_format_1 = require("../../input-format");
 const assert_1 = require("../../../../../../../util/assert");
 const meta_1 = require("../meta");
 const arrays_1 = require("../../../../../../../util/arrays");
-const parser_1 = require("../../parser");
 const values_1 = require("../values");
 const hooks_1 = require("../../hooks");
 const argument_1 = require("./argument");
 const expression_1 = require("../expression");
+const parser_1 = require("../../../json/parser");
 /**
  * Tries to parse the given data as a function call.
  *
@@ -31,10 +31,10 @@ function tryNormalizeFunctionCall(data, mappedWithName) {
     }
     parser_1.parseLog.trace('trying to parse function call');
     mappedWithName = (0, hooks_1.executeHook)(data.hooks.functions.onFunctionCall.before, data, mappedWithName);
-    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(data.config, fnBase.content);
-    const symbolContent = (0, input_format_1.getKeysGuarded)(unwrappedObj, data.config.childrenName);
+    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(fnBase.content);
+    const symbolContent = (0, input_format_1.getKeysGuarded)(unwrappedObj, input_format_1.childrenKey);
     let result;
-    const namedSymbolContent = (0, meta_1.getWithTokenType)(data.config.tokenMap, symbolContent);
+    const namedSymbolContent = (0, meta_1.getWithTokenType)(symbolContent);
     if (namedSymbolContent.length === 1 && namedSymbolContent[0].name === "STR_CONST" /* RawRType.StringConst */) {
         // special handling when someone calls a function by string
         result = parseNamedFunctionCall(data, namedSymbolContent, mappedWithName, location, content);

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/definition.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeFunctionDefinition = void 0;
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
 const assert_1 = require("../../../../../../../util/assert");
@@ -9,6 +8,7 @@ const arrays_1 = require("../../../../../../../util/arrays");
 const structure_1 = require("../structure");
 const parameter_1 = require("./parameter");
 const log_1 = require("../../../../../../../util/log");
+const parser_1 = require("../../../json/parser");
 /**
  * Tries to parse the given data as a function definition.
  *
@@ -25,7 +25,7 @@ function tryNormalizeFunctionDefinition(data, mappedWithName) {
     }
     parser_1.parseLog.trace('trying to parse function definition');
     mappedWithName = (0, hooks_1.executeHook)(data.hooks.functions.onFunctionDefinition.before, data, mappedWithName);
-    const { content, location } = (0, meta_1.retrieveMetaStructure)(data.config, fnBase.content);
+    const { content, location } = (0, meta_1.retrieveMetaStructure)(fnBase.content);
     const openParen = mappedWithName[1];
     (0, assert_1.guard)(openParen.name === "(" /* RawRType.ParenLeft */, () => `expected opening parenthesis, yet received ${openParen.name}`);
     const closingParenIndex = mappedWithName.findIndex(x => x.name === ")" /* RawRType.ParenRight */);

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/parameter.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeParameter = void 0;
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const hooks_1 = require("../../hooks");
 const log_1 = require("../../../../../../../util/log");
 const assert_1 = require("../../../../../../../util/assert");
 const structure_1 = require("../structure");
+const parser_1 = require("../../../json/parser");
 /**
  * Either parses `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]` as a parameter of a function definition in R.
  * Probably directly called by the function definition parser as otherwise, we do not expect to find parameters.
@@ -29,7 +29,7 @@ function tryNormalizeParameter(data, objs) {
         return (0, hooks_1.executeUnknownHook)(data.hooks.functions.onParameter.unknown, data, objs);
     }
     const defaultValue = objs.length === 3 ? parseWithDefaultValue(data, objs) : undefined;
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, symbol.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(symbol.content);
     const result = {
         type: "RParameter" /* RType.Parameter */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/index.d.ts

@@ -7,4 +7,3 @@ export * from './operators';
 export * from './structure';
 export * from './expression';
 export * from './meta';
-export * from './xml-to-json';

package/r-bridge/lang-4.x/ast/parser/xml/internal/index.js

@@ -23,5 +23,4 @@ __exportStar(require("./operators"), exports);
 __exportStar(require("./structure"), exports);
 __exportStar(require("./expression"), exports);
 __exportStar(require("./meta"), exports);
-__exportStar(require("./xml-to-json"), exports);
 //# sourceMappingURL=index.js.map

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/break.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeBreak = void 0;
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
+const parser_1 = require("../../../json/parser");
 function normalizeBreak(data, obj) {
     parser_1.parseLog.debug(`[break] try: ${JSON.stringify(obj)}`);
     obj = (0, hooks_1.executeHook)(data.hooks.loops.onBreak.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     const result = {
         type: "RBreak" /* RType.Break */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/for.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeFor = void 0;
 const input_format_1 = require("../../input-format");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const assert_1 = require("../../../../../../../util/assert");
 const values_1 = require("../values");
 const structure_1 = require("../structure");
 const hooks_1 = require("../../hooks");
 const other_1 = require("../other");
+const parser_1 = require("../../../json/parser");
 function tryNormalizeFor(data, forToken, head, body) {
     // funny, for does not use top-level parenthesis
     if (forToken.name !== "FOR" /* RawRType.For */) {
@@ -35,7 +35,7 @@ function tryNormalizeFor(data, forToken, head, body) {
             parseBody,
         ])}`);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, forToken.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(forToken.content);
     const result = {
         type: "RForLoop" /* RType.ForLoop */,
         variable: parsedVariable,
@@ -54,10 +54,7 @@ function tryNormalizeFor(data, forToken, head, body) {
 exports.tryNormalizeFor = tryNormalizeFor;
 function normalizeForHead(data, forCondition) {
     // must have a child which is `in`, a variable on the left, and a vector on the right
-    const children = (0, input_format_1.getKeysGuarded)(forCondition, data.config.childrenName).map(content => ({
-        name: (0, meta_1.getTokenType)(data.config.tokenMap, content),
-        content
-    }));
+    const children = (0, input_format_1.getKeysGuarded)(forCondition, input_format_1.childrenKey).map(content => ({ name: (0, meta_1.getTokenType)(content), content }));
     const { comments, others } = (0, structure_1.splitComments)(children);
     const inPosition = others.findIndex(elem => elem.name === "IN" /* RawRType.ForIn */);
     (0, assert_1.guard)(inPosition > 0 && inPosition < others.length - 1, () => `for loop searched in and found at ${inPosition}, but this is not in legal bounds for ${JSON.stringify(children)}`);

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/next.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeNext = void 0;
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
+const parser_1 = require("../../../json/parser");
 function normalizeNext(data, obj) {
     parser_1.parseLog.debug(`[next] try: ${JSON.stringify(obj)}`);
     obj = (0, hooks_1.executeHook)(data.hooks.loops.onNext.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     const result = {
         type: "RNext" /* RType.Next */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/repeat.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeRepeat = void 0;
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const structure_1 = require("../structure");
 const assert_1 = require("../../../../../../../util/assert");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Try to parse the construct as a {@link RRepeatLoop}.
  *
@@ -24,7 +24,7 @@ function tryNormalizeRepeat(data, repeatToken, body) {
     ({ repeatToken, body } = (0, hooks_1.executeHook)(data.hooks.loops.onRepeatLoop.before, data, { repeatToken, body }));
     const parseBody = (0, structure_1.tryNormalizeSingleNode)(data, body);
     (0, assert_1.guard)(parseBody.type !== "RDelimiter" /* RType.Delimiter */, () => `no body for repeat-loop ${JSON.stringify(repeatToken)} (${JSON.stringify(body)})`);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, repeatToken.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(repeatToken.content);
     const result = {
         type: "RRepeatLoop" /* RType.RepeatLoop */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/while.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeWhile = void 0;
 const input_format_1 = require("../../input-format");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const structure_1 = require("../structure");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 function tryNormalizeWhile(data, whileToken, leftParen, condition, rightParen, body) {
     if (whileToken.name !== "WHILE" /* RawRType.While */) {
         parser_1.parseLog.debug('encountered non-while token for supposed while-loop structure');
@@ -26,7 +26,7 @@ function tryNormalizeWhile(data, whileToken, leftParen, condition, rightParen, b
             parseBody,
         ])} for ${JSON.stringify([whileToken, condition, body])}`);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, whileToken.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(whileToken.content);
     const result = {
         type: "RWhileLoop" /* RType.WhileLoop */,
         condition: parsedCondition,

package/r-bridge/lang-4.x/ast/parser/xml/internal/meta.d.ts

@@ -1,6 +1,5 @@
 import type { NamedXmlBasedJson, XmlBasedJson } from '../input-format';
 import type { SourceRange } from '../../../../../../util/range';
-import type { XmlParserConfig } from '../config';
 import type { RawRType, RExpressionList, RNode } from '../../../model';
 /**
  * if the passed object is an array with only one element, remove the array wrapper
@@ -14,37 +13,33 @@ export declare function extractLocation(ast: XmlBasedJson): SourceRange;
  * The json object that represents the input xml contains various meta-information.
  * This function extracts the meta-information and returns it.
  *
- * @param config - The configuration of the parser to use to retrieve the corresponding name fields
  * @param obj    - The json object to extract the meta-information from
  */
-export declare function retrieveMetaStructure(config: XmlParserConfig, obj: XmlBasedJson): {
+export declare function retrieveMetaStructure(obj: XmlBasedJson): {
     /** the obj passed in, but potentially without surrounding array wrappers (see {@link objectWithArrUnwrap}) */
     unwrappedObj: XmlBasedJson;
     /** location information of the corresponding R-ast element */
     location: SourceRange;
     content: string;
 };
-export declare function revertTokenReplacement(tokenMap: XmlParserConfig['tokenMap'], token: string): string;
-export declare function assureTokenType(tokenMap: XmlParserConfig['tokenMap'], obj: XmlBasedJson, expectedName: RawRType): void;
+export declare function assureTokenType(obj: XmlBasedJson, expectedName: RawRType): void;
 /**
  * Extract the token-type of the given object. This is based on the knowledge, that all json objects created
  * from the R xml have a name attached.
  *
- * @param tokenMap - used to revert token types (i.e., revert `xmlparsedata`)
  * @param content  - the json object to extract the token-type from
  */
-export declare function getTokenType(tokenMap: XmlParserConfig['tokenMap'], content: XmlBasedJson): RawRType;
-export declare function getWithTokenType(tokenMap: XmlParserConfig['tokenMap'], obj: XmlBasedJson[]): {
+export declare function getTokenType(content: XmlBasedJson): RawRType;
+export declare function getWithTokenType(obj: XmlBasedJson[]): {
     name: RawRType;
     content: XmlBasedJson;
 }[];
-export declare function retrieveOpName(config: XmlParserConfig, operator: NamedXmlBasedJson): string;
+export declare function retrieveOpName(operator: NamedXmlBasedJson): string;
 /**
  * Ensure that the first child is completely before the second child.
  *
- * @param config - the configuration of the parser to use to retrieve the corresponding name fields
  * @param first  - the first child which should be the lhs
  * @param second - the second child which should be the rhs
  */
-export declare function ensureChildrenAreLhsAndRhsOrdered(config: XmlParserConfig, first: XmlBasedJson, second: XmlBasedJson): void;
+export declare function ensureChildrenAreLhsAndRhsOrdered(first: XmlBasedJson, second: XmlBasedJson): void;
 export declare function ensureExpressionList<Info>(node: RNode<Info>): RExpressionList<Info>;

package/r-bridge/lang-4.x/ast/parser/xml/internal/meta.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureExpressionList = exports.ensureChildrenAreLhsAndRhsOrdered = exports.retrieveOpName = exports.getWithTokenType = exports.getTokenType = exports.assureTokenType = exports.revertTokenReplacement = exports.retrieveMetaStructure = exports.extractLocation = exports.objectWithArrUnwrap = void 0;
+exports.ensureExpressionList = exports.ensureChildrenAreLhsAndRhsOrdered = exports.retrieveOpName = exports.getWithTokenType = exports.getTokenType = exports.assureTokenType = exports.retrieveMetaStructure = exports.extractLocation = exports.objectWithArrUnwrap = void 0;
 const input_format_1 = require("../input-format");
 const range_1 = require("../../../../../../util/range");
 const assert_1 = require("../../../../../../util/assert");
@@ -34,13 +34,12 @@ exports.extractLocation = extractLocation;
  * The json object that represents the input xml contains various meta-information.
  * This function extracts the meta-information and returns it.
  *
- * @param config - The configuration of the parser to use to retrieve the corresponding name fields
  * @param obj    - The json object to extract the meta-information from
  */
-function retrieveMetaStructure(config, obj) {
+function retrieveMetaStructure(obj) {
     const unwrappedObj = objectWithArrUnwrap(obj);
-    const attributes = obj[config.attributeName];
-    const content = obj[config.contentName] ?? '';
+    const attributes = obj[input_format_1.attributesKey];
+    const content = obj[input_format_1.contentKey] ?? '';
     (0, assert_1.guard)(attributes !== undefined, () => `expected attributes to be defined for ${JSON.stringify(obj)}`);
     const location = extractLocation(attributes);
     return {
@@ -50,13 +49,8 @@ function retrieveMetaStructure(config, obj) {
     };
 }
 exports.retrieveMetaStructure = retrieveMetaStructure;
-function revertTokenReplacement(tokenMap, token) {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- it is still necessary as we do not know if we have a replacement for the given token
-    return tokenMap[token] ?? token;
-}
-exports.revertTokenReplacement = revertTokenReplacement;
-function assureTokenType(tokenMap, obj, expectedName) {
-    const name = getTokenType(tokenMap, obj);
+function assureTokenType(obj, expectedName) {
+    const name = getTokenType(obj);
     if (name !== expectedName) {
         throw new input_format_1.XmlParseError(`expected name to be ${expectedName}, yet received ${name} for ${JSON.stringify(obj)}`);
     }
@@ -66,37 +60,35 @@ exports.assureTokenType = assureTokenType;
  * Extract the token-type of the given object. This is based on the knowledge, that all json objects created
  * from the R xml have a name attached.
  *
- * @param tokenMap - used to revert token types (i.e., revert `xmlparsedata`)
  * @param content  - the json object to extract the token-type from
  */
-function getTokenType(tokenMap, content) {
-    return revertTokenReplacement(tokenMap, (0, input_format_1.getKeysGuarded)(content, '#name'));
+function getTokenType(content) {
+    return (0, input_format_1.getKeysGuarded)(content, input_format_1.nameKey);
 }
 exports.getTokenType = getTokenType;
-function getWithTokenType(tokenMap, obj) {
+function getWithTokenType(obj) {
     return obj.map((content) => ({
-        name: getTokenType(tokenMap, content),
+        name: getTokenType(content),
         content
     }));
 }
 exports.getWithTokenType = getWithTokenType;
-function retrieveOpName(config, operator) {
+function retrieveOpName(operator) {
     /*
    * only real arithmetic ops have their operation as their own name, the others identify via content
    */
-    return operator.content[config.contentName];
+    return operator.content[input_format_1.contentKey];
 }
 exports.retrieveOpName = retrieveOpName;
 /**
  * Ensure that the first child is completely before the second child.
  *
- * @param config - the configuration of the parser to use to retrieve the corresponding name fields
  * @param first  - the first child which should be the lhs
  * @param second - the second child which should be the rhs
  */
-function ensureChildrenAreLhsAndRhsOrdered(config, first, second) {
-    const firstOtherLoc = extractLocation(first[config.attributeName]);
-    const secondOtherLoc = extractLocation(second[config.attributeName]);
+function ensureChildrenAreLhsAndRhsOrdered(first, second) {
+    const firstOtherLoc = extractLocation(first[input_format_1.attributesKey]);
+    const secondOtherLoc = extractLocation(second[input_format_1.attributesKey]);
     if (!(0, range_1.rangeStartsCompletelyBefore)(firstOtherLoc, secondOtherLoc)) {
         throw new input_format_1.XmlParseError(`expected the first child to be the lhs, yet received ${JSON.stringify(first)} & ${JSON.stringify(second)}`);
     }