diff --git a/incremental/tools/panda/patch/language-enum.patch b/incremental/tools/panda/patch/language-enum.patch index 85911233847bfe9da8b42828f2abeb80e624f2a5..8f6fd1120ffec85d89bce37e9ec3b989448d6259 100644 --- a/incremental/tools/panda/patch/language-enum.patch +++ b/incremental/tools/panda/patch/language-enum.patch @@ -5,11 +5,11 @@ }; +dictionary Es2pandaLanguage { -+ i32 AS = 0; -+ i32 JS = 1; -+ i32 TS = 2; -+ i32 ETS = 3; -+ i32 COUNT = 4; ++ i32 LANGUAGE_AS = 0; ++ i32 LANGUAGE_JS = 1; ++ i32 LANGUAGE_TS = 2; ++ i32 LANGUAGE_ETS = 3; ++ i32 LANGUAGE_COUNT = 4; +}; + interface es2panda_SuggestionInfo { diff --git a/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts b/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts index 98d53ab1622ef942fa71fa9c07d92aa2c7b611fa..f7d35970ae4f7f1ac61b4d8df3ce6c825f789d6c 100644 --- a/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts +++ b/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts @@ -153,7 +153,7 @@ export class LegacyTransformer extends AbstractVisitor { [...definition.body, instantiate_Interop], definition.modifiers, arkts.Es2pandaModifierFlags.MODIFIER_FLAGS_NONE, - arkts.Es2pandaLanguage.JS + arkts.Es2pandaLanguage.LANGUAGE_JS ); if (arkts.isETSStructDeclaration(node)) { diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts index 4df309067df99ecbdd52a88a44f56cc49ee82741..cf10bfc56ccb8b386735871ebcbfcf89ef643f03 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts @@ -41,7 +41,7 @@ export function createClassDefinition( body: readonly AstNode[], modifiers: Es2pandaClassDefinitionModifiers, flags: Es2pandaModifierFlags, annotations?: readonly AnnotationUsage[]): ClassDefinition { - return ClassDefinition.create3ClassDefinition(ident, typeParams, superTypeParams, _implements, ctor, superClass, body, modifiers, flags, Es2pandaLanguage.ETS, annotations) + return ClassDefinition.create3ClassDefinition(ident, typeParams, superTypeParams, _implements, ctor, superClass, body, modifiers, flags, Es2pandaLanguage.LANGUAGE_ETS, annotations) } export function updateClassDefinition( @@ -81,7 +81,7 @@ export function updateClassDefinition( body, modifiers, flags, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, annotations, ) } diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts index 2cf87d0a917d164c123f8f8cec91d8b29740b43a..a6e20d281cd6ea31fc3ee12bbb9dc32a0e312b1e 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts @@ -37,7 +37,7 @@ export function updateETSModule( statementList, ident, flag, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, program, ), original, diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts index ac30c6bd4a0ad287ffd6cc3991005a4245d389f4..e6f08ab3174c44e5e2918a6f21a6526455beba67 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts @@ -51,7 +51,7 @@ export function createScriptFunction( ), datafuncFlags, dataflags, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, ident, annotations, ) diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts index de38f28badfe17ea0dde2adcaadfc42235bcff82..1b63b1d0a3e54179276d7d5ba69f915a1d528578 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts @@ -35,7 +35,7 @@ export function createTSInterfaceDeclaration( body, isStatic, isExternal, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, modifierFlags, ) } diff --git a/ui2abc/libarkts/src/arkts-api/visitor.ts b/ui2abc/libarkts/src/arkts-api/visitor.ts index 0f8fb563844091717d5a890497504cf9e93237d3..b850b4b7ef77eba8d34fc678a7b0654b43d6690c 100644 --- a/ui2abc/libarkts/src/arkts-api/visitor.ts +++ b/ui2abc/libarkts/src/arkts-api/visitor.ts @@ -180,7 +180,7 @@ function visitETSModule(node: ETSModule, visitor: Visitor) { newStatements, newIdent, node.getNamespaceFlag(), - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, node.program, ) result.onUpdate(node)