Normalize V2: Adapt remaining access tests

src/r-bridge/lang-4.x/ast/parser/xml/v2/internal/access.ts

@@ -1,11 +1,12 @@
 import { XmlBasedJson, XmlParseError } from '../../common/input-format'
 import { getTokenType, retrieveMetaStructure } from '../../common/meta'
-import { RType, RNode, RArgument, RawRType, RFunctionCall } from '../../../../model'
+import { RType, RNode, RawRType, RFunctionCall } from '../../../../model'
 import { guard } from '../../../../../../../util/assert'
 import { splitArrayOn } from '../../../../../../../util/arrays'
 import { NormalizeConfiguration } from '../data'
 import { normalizeSingleToken } from './single-element'
 import { tryToNormalizeArgument } from './functions/argument'
+import {InternalScope} from './internal'
 
 /**
  * Normalize the given data as access (e.g., indexing).
@@ -53,8 +54,7 @@ export function normalizeAccess(configuration: NormalizeConfiguration, tokens: r
 			flavor:       'named',
 			functionName: {
 				type:      RType.Symbol,
-				// TODO: just lock "internal" here
-				namespace: undefined,
+				namespace: InternalScope,
 				lexeme:    content,
 				info:      {},
 				content,
@@ -70,7 +70,9 @@ export function normalizeAccess(configuration: NormalizeConfiguration, tokens: r
 	// otherwise we have to process
 	const remaining: readonly XmlBasedJson[] = tokens.slice(2, tokens.length - closingLength)
 
-	const splitAccessOnComma = splitArrayOn(remaining, elem => elem.name === RawRType.Comma)
+	const splitAccessOnComma = splitArrayOn(remaining, elem =>
+		getTokenType(configuration.tokenMap, elem) === RawRType.Comma
+	)
 
 	const parsedAccess: (RNode | undefined)[] = splitAccessOnComma.map((elems: readonly XmlBasedJson[]) =>
 		elems.length === 0 ? undefined : normalizeAccessArgument(configuration, elems)
@@ -84,8 +86,7 @@ export function normalizeAccess(configuration: NormalizeConfiguration, tokens: r
 		flavor:       'named',
 		functionName: {
 			type:      RType.Symbol,
-			// TODO: just lock "internal" here
-			namespace: undefined,
+			namespace: InternalScope,
 			lexeme:    content,
 			info:      {},
 			content,
@@ -100,7 +101,7 @@ export function normalizeAccess(configuration: NormalizeConfiguration, tokens: r
 }
 
 
-function normalizeAccessArgument(config: NormalizeConfiguration, elements: readonly XmlBasedJson[]): RArgument {
+function normalizeAccessArgument(config: NormalizeConfiguration, elements: readonly XmlBasedJson[]): RNode {
 	const res = tryToNormalizeArgument(config, elements)
 	guard(res !== undefined, () => `expected one access result in access as argument, yet received ${JSON.stringify(res)} for ${JSON.stringify(elements)}`)
 	return res

src/r-bridge/lang-4.x/ast/parser/xml/v2/internal/functions/argument.ts

@@ -1,6 +1,6 @@
 import { XmlBasedJson, XmlParseError } from '../../../common/input-format'
 import { getTokenType, retrieveMetaStructure } from '../../../common/meta'
-import { RNode, RType, RSymbol, RArgument, RawRType } from '../../../../../model'
+import { RNode, RType, RSymbol, RawRType } from '../../../../../model'
 import { NormalizeConfiguration } from '../../data'
 import { log } from '../../../../../../../../util/log'
 import { guard } from '../../../../../../../../util/assert'
@@ -16,7 +16,7 @@
  *
  * @returns The parsed argument or `undefined` if the given object is not an argument.
  */
-export function tryToNormalizeArgument(configuration: NormalizeConfiguration, objs: readonly XmlBasedJson[]): RArgument | undefined {
+export function tryToNormalizeArgument(configuration: NormalizeConfiguration, objs: readonly XmlBasedJson[]): RNode | undefined {
 	if(objs.length < 1 || objs.length > 3) {
 		log.warn(`Either [expr|value], [SYMBOL_SUB, EQ_SUB], or [SYMBOL_SUB, EQ_SUB, expr], but got: ${objs.map(o => JSON.stringify(o)).join(', ')}`)
 		return undefined
@@ -51,16 +51,20 @@
 
 	guard(parsedValue !== undefined && parsedValue?.type !== RType.Delimiter, () => `[argument] parsed value must not be undefined, yet: ${JSON.stringify(objs)}`)
 
-	return {
-		type:   RType.Argument,
-		location,
-		lexeme: content,
-		name,
-		value:  parsedValue ?? undefined,
-		info:   {
-			fullRange:        location,
-			fullLexeme:       content,
-			additionalTokens: []
+	if(name === undefined) {
+		return parsedValue ?? undefined
+	} else {
+		return {
+			type:   RType.Argument,
+			location,
+			lexeme: content,
+			name,
+			value:  parsedValue ?? undefined,
+			info:   {
+				fullRange:        location,
+				fullLexeme:       content,
+				additionalTokens: []
+			}
 		}
 	}
 }

src/r-bridge/lang-4.x/ast/parser/xml/v2/internal/internal.ts

@@ -0,0 +1 @@
+export const InternalScope = '.$internal'