diff --git a/.github/workflows/ant-lara-2.0-legacy.yml b/.github/workflows/ant-lara-2.0-legacy.yml deleted file mode 100644 index 8eac8986c..000000000 --- a/.github/workflows/ant-lara-2.0-legacy.yml +++ /dev/null @@ -1,69 +0,0 @@ -# This workflow will build a Java project with Ant -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant - -name: Java CI - Lara 2.0 Legacy - -on: - push: - branches: [ lara-2.0-legacy ] - pull_request: - branches: [ lara-2.0-legacy ] - - # Daily at midnight - schedule: - - cron: '0 0 * * *' - -permissions: - checks: write - -jobs: - build: - - runs-on: ubuntu-latest - - #defaults: - # run: - # working-directory: ./.. - - steps: - - uses: actions/checkout@v4 - # Because of scheduled runs, by default run on default branch - with: - ref: lara-2.0-legacy - - - name: Cache ivy dependencies - id: cache-nivy - uses: actions/cache@v3 - env: - cache-name: cache-ivy-dependencies - with: - # ivy dependencies cache files are stored in `~/.ivy2` on Linux/macOS - path: ~/.ivy2 - key: ${{ runner.os }}-build-${{ env.cache-name }} - - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - - name: Generate build.xml - run: | - wget -q -N http://specs.fe.up.pt/tools/eclipse-build.jar - java -jar eclipse-build.jar https://github.com/specs-feup/specs-java-libs https://github.com/specs-feup/lara-framework?commit=lara-2.0-legacy ./ - wget -N -O /usr/share/ant/lib/ivy-2.5.0.jar specs.fe.up.pt/libs/ivy-2.5.0.jar - - name: Build with Ant - run: | - ant -noinput -buildfile build.xml - - - name: List directory - run: | - echo "Current folder" - ls - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3.6.1 - if: always() # always run even if the previous step fails - with: - report_paths: '**/reports-eclipse-build/TEST-*.xml' - summary: true - #exclude_sources: '' diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c694419f7..1227b80cc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,7 +1,9 @@ -# This workflow will build a Java project with Ant -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant +# This workflow will build a the whole project every day at midnight +# It will build the Java part and the JS part +# Every push to a branch will trigger the build +# Every pull request will trigger the build -name: Java +name: nightly on: push: @@ -17,15 +19,17 @@ permissions: env: JAVA_VERSION: 17 + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + DEFAULT_BRANCH: ${{ github.base_ref || 'master' }} jobs: build-java: name: Build Java runs-on: ubuntu-latest - env: - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - DEFAULT_BRANCH: ${{ github.base_ref || 'master' }} + outputs: + branch-exists-lara-framework: ${{ steps.Branch-lara-framework.outputs.value }} + branch-exists-specs-java-libs: ${{ steps.Branch-specs-java-libs.outputs.value }} steps: - name: Setup Java @@ -47,31 +51,45 @@ jobs: - name: Check if branch exists on lara-framework id: Branch-lara-framework - run: git ls-remote --heads https://github.com/specs-feup/lara-framework.git refs/heads/${{ env.BRANCH_NAME }} | wc -l + run: echo "value=$(git ls-remote --heads https://github.com/specs-feup/lara-framework.git refs/heads/${{ env.BRANCH_NAME }} | wc -l)" >> $GITHUB_OUTPUT - name: Check if branch exists on specs-java-libs id: Branch-specs-java-libs - run: git ls-remote --heads https://github.com/specs-feup/specs-java-libs.git refs/heads/${{ env.BRANCH_NAME }} | wc -l + run: echo "value=$(git ls-remote --heads https://github.com/specs-feup/specs-java-libs.git refs/heads/${{ env.BRANCH_NAME }} | wc -l)" >> $GITHUB_OUTPUT + + - name: Echo checks + run: | + echo "Branch-lara-framework: ${{ steps.Branch-lara-framework.outputs.value }}" + echo "Branch-specs-java-libs: ${{ steps.Branch-specs-java-libs.outputs.value }}" + echo "Branch name: ${{ env.BRANCH_NAME }}" + echo "Default branch: ${{ env.DEFAULT_BRANCH }}" - name: Checkout lara-framework uses: actions/checkout@v4 with: repository: specs-feup/lara-framework path: lara-framework - ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} - + ref: ${{ steps.Branch-lara-framework.outputs.value == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} + - name: Checkout specs-java-libs uses: actions/checkout@v4 with: repository: specs-feup/specs-java-libs path: specs-java-libs - ref: ${{ steps.Branch-specs-java-libs.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} + ref: ${{ steps.Branch-specs-java-libs.outputs.value == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} - name: Build with Gradle run: | cd clava/ClavaWeaver gradle installDist + - name: Test with Gradle + run: | + cd clava/ClavaWeaver + gradle test + env: + GITHUB_DEPENDENCY_GRAPH_ENABLED: false + - name: Upload ClavaWeaver artifacts uses: actions/upload-artifact@v4 with: @@ -85,7 +103,8 @@ jobs: strategy: fail-fast: false matrix: - node-version: ['latest'] + #node-version: ['latest', '20.x', '18.x'] + node-version: ['20.x', '18.x'] os: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.os }} @@ -107,16 +126,12 @@ jobs: with: path: clava - - name: Check if branch exists on lara-framework - id: Branch-lara-framework - run: git ls-remote --heads https://github.com/specs-feup/lara-framework.git refs/heads/${{ env.BRANCH_NAME }} | wc -l - - name: Checkout lara-framework uses: actions/checkout@v4 with: repository: specs-feup/lara-framework path: lara-framework - ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} + ref: ${{ needs.build-java.outputs.branch-exists-lara-framework == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} - name: Setup js workspace run: | diff --git a/ClangAstParser/test/eu/antarex/clang/parser/AClangAstTester.java b/ClangAstParser/test/eu/antarex/clang/parser/AClangAstTester.java index 2986013ad..859bfa976 100644 --- a/ClangAstParser/test/eu/antarex/clang/parser/AClangAstTester.java +++ b/ClangAstParser/test/eu/antarex/clang/parser/AClangAstTester.java @@ -1,11 +1,11 @@ /** * Copyright 2016 SPeCS. - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + *

* http://www.apache.org/licenses/LICENSE-2.0 - * + *

* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. under the License. @@ -13,19 +13,8 @@ package eu.antarex.clang.parser; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import org.junit.Assert; import org.junit.Before; -import org.junit.Test; - import pt.up.fe.specs.clang.codeparser.CodeParser; import pt.up.fe.specs.clang.codeparser.ParallelCodeParser; import pt.up.fe.specs.clang.dumper.ClangAstDumper; @@ -37,6 +26,10 @@ import pt.up.fe.specs.util.SpecsSystem; import pt.up.fe.specs.util.providers.ResourceProvider; +import java.io.File; +import java.util.*; +import java.util.stream.Collectors; + public abstract class AClangAstTester { private static final boolean CLEAN_CLANG_FILES = true; @@ -183,7 +176,6 @@ public static void clear() throws Exception { } - @Test public void testProper() { // Parse files diff --git a/ClangAstParser/test/eu/antarex/clang/parser/CTester.java b/ClangAstParser/test/eu/antarex/clang/parser/CTester.java index d7f5c00db..c2097869a 100644 --- a/ClangAstParser/test/eu/antarex/clang/parser/CTester.java +++ b/ClangAstParser/test/eu/antarex/clang/parser/CTester.java @@ -1,11 +1,11 @@ /** * Copyright 2017 SPeCS. - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + *

* http://www.apache.org/licenses/LICENSE-2.0 - * + *

* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. under the License. diff --git a/Clava-JS/package.json b/Clava-JS/package.json index 33630774a..32796532c 100644 --- a/Clava-JS/package.json +++ b/Clava-JS/package.json @@ -29,13 +29,13 @@ "build:code": "tsc -b src-code", "build:watch": "npm run build -- --watch", "lint": "eslint .", - "test": "cross-env NODE_OPTIONS='$NODE_OPTIONS --experimental-vm-modules' jest --detectOpenHandles --forceExit", + "test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest --detectOpenHandles --forceExit", "test:api": "npm run test -- src-api", "test:code": "npm run test -- src-code", "test:cov": "npm run test -- --coverage", "test:watch": "npm run test -- --watch", "java-dist": "npx lara-java-dist --jsSourceFolder api --jsDestinationFolder ../ClavaLaraApi/src-lara/clava/ --javaClassname ClavaApiJsResource --javaPackageName pt.up.fe.specs.clava.weaver --javaDestinationFolder ../ClavaLaraApi/src-java/pt/up/fe/specs/clava/weaver/ --javaResourceNamespace clava", - "build-interfaces": "npx lara-build-interfaces --input ../ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.json --lara lara-js/LaraJoinPointSpecification.json --output src-api/Joinpoints.ts" + "build-interfaces": "npx lara-build-interfaces --input ../ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.json --lara @specs-feup/lara/LaraJoinPointSpecification.json --output src-api/Joinpoints.ts" }, "repository": { "type": "git", diff --git a/Clava-JS/src-api/Joinpoints.ts b/Clava-JS/src-api/Joinpoints.ts index d29d515b5..ca3c4e9b0 100644 --- a/Clava-JS/src-api/Joinpoints.ts +++ b/Clava-JS/src-api/Joinpoints.ts @@ -16,7 +16,7 @@ import { registerJoinpointMapper, wrapJoinPoint, unwrapJoinPoint, -} from "lara-js/api/LaraJoinPoint.js"; +} from "@specs-feup/lara/api/LaraJoinPoint.js"; type PrivateMapper = { "Joinpoint": typeof Joinpoint, @@ -142,7 +142,7 @@ type DefaultAttributeMap = { export class Joinpoint extends LaraJoinPoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -484,9 +484,9 @@ export class Joinpoint extends LaraJoinPoint { */ setData(source: object): void { return wrapJoinPoint(this._javaObject.setData(JSON.stringify(source))); } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. */ - setFirstChild(node: Joinpoint): void { return wrapJoinPoint(this._javaObject.setFirstChild(unwrapJoinPoint(node))); } + setFirstChild(node: Joinpoint): Joinpoint { return wrapJoinPoint(this._javaObject.setFirstChild(unwrapJoinPoint(node))); } /** * Sets the commented that are embedded in a node */ @@ -500,9 +500,9 @@ export class Joinpoint extends LaraJoinPoint { */ setInlineComments(p1: string[] | string): void { return wrapJoinPoint(this._javaObject.setInlineComments(unwrapJoinPoint(p1))); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. */ - setLastChild(node: Joinpoint): void { return wrapJoinPoint(this._javaObject.setLastChild(unwrapJoinPoint(node))); } + setLastChild(node: Joinpoint): Joinpoint { return wrapJoinPoint(this._javaObject.setLastChild(unwrapJoinPoint(node))); } /** * Sets the type of a node, if it has a type */ @@ -531,7 +531,7 @@ export class Joinpoint extends LaraJoinPoint { export class Attribute extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -544,7 +544,7 @@ export class Attribute extends Joinpoint { */ export class ClavaException extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -556,7 +556,7 @@ export class ClavaException extends Joinpoint { export class Comment extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -571,7 +571,7 @@ export class Comment extends Joinpoint { */ export class Decl extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -587,7 +587,7 @@ export class Decl extends Joinpoint { */ export class Empty extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -596,7 +596,7 @@ export class Empty extends Joinpoint { export class Expression extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -622,7 +622,7 @@ export class Expression extends Joinpoint { */ export class FileJp extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -763,7 +763,7 @@ export class FileJp extends Joinpoint { export class ImplicitValue extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -775,7 +775,7 @@ export class ImplicitValue extends Expression { */ export class Include extends Decl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -796,7 +796,7 @@ export class Include extends Decl { export class InitList extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -809,7 +809,7 @@ export class InitList extends Expression { export class Literal extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -818,7 +818,7 @@ export class Literal extends Expression { export class MemberAccess extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -846,7 +846,7 @@ export class MemberAccess extends Expression { */ export class NamedDecl extends Decl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -874,7 +874,7 @@ export class NamedDecl extends Decl { export class NewExpr extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -883,7 +883,7 @@ export class NewExpr extends Expression { export class Op extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -898,7 +898,7 @@ export class Op extends Expression { export class ParenExpr extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -914,7 +914,7 @@ export class ParenExpr extends Expression { */ export class Pragma extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -952,7 +952,7 @@ export class Pragma extends Joinpoint { */ export class Program extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1058,7 +1058,7 @@ export class Program extends Joinpoint { */ export class RecordJp extends NamedDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1082,7 +1082,7 @@ export class RecordJp extends NamedDecl { export class Statement extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1096,7 +1096,7 @@ export class Statement extends Joinpoint { */ export class Struct extends RecordJp { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1105,7 +1105,7 @@ export class Struct extends RecordJp { export class Switch extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1133,7 +1133,7 @@ export class Switch extends Statement { */ export class Tag extends Pragma { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "id", @@ -1146,7 +1146,7 @@ export class Tag extends Pragma { export class TernaryOp extends Op { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1158,7 +1158,7 @@ export class TernaryOp extends Op { export class This extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1167,7 +1167,7 @@ export class This extends Expression { export class Type extends Joinpoint { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1248,7 +1248,7 @@ export class Type extends Joinpoint { */ export class TypedefNameDecl extends NamedDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1260,7 +1260,7 @@ export class TypedefNameDecl extends NamedDecl { */ export class TypedefType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1277,7 +1277,7 @@ export class TypedefType extends Type { export class UnaryExprOrType extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1293,7 +1293,7 @@ export class UnaryExprOrType extends Expression { export class UnaryOp extends Op { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1304,7 +1304,7 @@ export class UnaryOp extends Op { export class UndefinedType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1316,7 +1316,7 @@ export class UndefinedType extends Type { */ export class Varref extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1346,7 +1346,7 @@ export class Varref extends Expression { export class WrapperStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1357,7 +1357,7 @@ export class WrapperStmt extends Statement { export class AccessSpecifier extends Decl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "kind", @@ -1370,7 +1370,7 @@ export class AccessSpecifier extends Decl { export class AdjustedType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1383,7 +1383,7 @@ export class AdjustedType extends Type { export class ArrayAccess extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1412,7 +1412,7 @@ export class ArrayAccess extends Expression { export class ArrayType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1427,7 +1427,7 @@ export class ArrayType extends Type { export class BinaryOp extends Op { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1443,7 +1443,7 @@ export class BinaryOp extends Op { export class BoolLiteral extends Literal { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1453,7 +1453,7 @@ export class BoolLiteral extends Literal { export class Break extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1466,7 +1466,7 @@ export class Break extends Statement { export class BuiltinType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1496,7 +1496,7 @@ export class BuiltinType extends Type { export class Call extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1575,7 +1575,7 @@ export class Call extends Expression { export class Case extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1608,7 +1608,7 @@ export class Case extends Statement { export class Cast extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1624,7 +1624,7 @@ export class Cast extends Expression { export class CilkSpawn extends Call { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1633,7 +1633,7 @@ export class CilkSpawn extends Call { export class CilkSync extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1645,7 +1645,7 @@ export class CilkSync extends Statement { */ export class Class extends RecordJp { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1698,7 +1698,7 @@ export class Class extends RecordJp { export class Continue extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1707,7 +1707,7 @@ export class Continue extends Statement { export class CudaKernelCall extends Call { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1720,7 +1720,7 @@ export class CudaKernelCall extends Call { export class DeclStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1736,7 +1736,7 @@ export class DeclStmt extends Statement { */ export class Declarator extends NamedDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1745,7 +1745,7 @@ export class Declarator extends NamedDecl { export class DeleteExpr extends Expression { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1757,7 +1757,7 @@ export class DeleteExpr extends Expression { */ export class ElaboratedType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1778,7 +1778,7 @@ export class ElaboratedType extends Type { export class EmptyStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1790,7 +1790,7 @@ export class EmptyStmt extends Statement { */ export class EnumDecl extends NamedDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1800,7 +1800,7 @@ export class EnumDecl extends NamedDecl { export class EnumeratorDecl extends NamedDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1809,7 +1809,7 @@ export class EnumeratorDecl extends NamedDecl { export class ExprStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1825,7 +1825,7 @@ export class ExprStmt extends Statement { */ export class Field extends Declarator { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1834,7 +1834,7 @@ export class Field extends Declarator { export class FloatLiteral extends Literal { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -1847,7 +1847,7 @@ export class FloatLiteral extends Literal { */ export class FunctionJp extends Declarator { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -1999,7 +1999,7 @@ export class FunctionJp extends Declarator { export class FunctionType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2019,7 +2019,7 @@ export class FunctionType extends Type { export class GotoStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2034,7 +2034,7 @@ export class GotoStmt extends Statement { export class If extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2062,7 +2062,7 @@ export class If extends Statement { export class IntLiteral extends Literal { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2072,7 +2072,7 @@ export class IntLiteral extends Literal { export class LabelDecl extends NamedDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -2081,7 +2081,7 @@ export class LabelDecl extends NamedDecl { export class LabelStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2096,7 +2096,7 @@ export class LabelStmt extends Statement { export class Loop extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "kind", @@ -2223,7 +2223,7 @@ export class Loop extends Statement { */ export class Marker extends Pragma { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "id", @@ -2237,7 +2237,7 @@ export class Marker extends Pragma { export class MemberCall extends Call { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -2251,7 +2251,7 @@ export class MemberCall extends Call { */ export class Method extends FunctionJp { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -2268,7 +2268,7 @@ export class Method extends FunctionJp { */ export class Omp extends Pragma { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "kind", @@ -2489,7 +2489,7 @@ export class Omp extends Pragma { export class ParenType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2504,7 +2504,7 @@ export class ParenType extends Type { export class PointerType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2523,7 +2523,7 @@ export class PointerType extends Type { export class QualType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2534,7 +2534,7 @@ export class QualType extends Type { export class ReturnStmt extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2547,7 +2547,7 @@ export class ReturnStmt extends Statement { */ export class Scope extends Statement { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2620,7 +2620,7 @@ export class Scope extends Statement { export class TagType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2634,7 +2634,7 @@ export class TagType extends Type { export class TemplateSpecializationType extends Type { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2650,7 +2650,7 @@ export class TemplateSpecializationType extends Type { */ export class TypedefDecl extends TypedefNameDecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -2662,7 +2662,7 @@ export class TypedefDecl extends TypedefNameDecl { */ export class Vardecl extends Declarator { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", @@ -2731,7 +2731,7 @@ export class Vardecl extends Declarator { export class VariableArrayType extends ArrayType { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2746,7 +2746,7 @@ export class VariableArrayType extends ArrayType { export class Body extends Scope { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2755,7 +2755,7 @@ export class Body extends Scope { export class CilkFor extends Loop { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "kind", @@ -2764,7 +2764,7 @@ export class CilkFor extends Loop { export class EnumType extends TagType { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: null, @@ -2774,7 +2774,7 @@ export class EnumType extends TagType { export class Param extends Vardecl { /** - * @hidden + * @internal */ static readonly _defaultAttributeInfo: {readonly map?: DefaultAttributeMap, readonly name: string | null, readonly type?: PrivateMapper, readonly jpMapper?: typeof JoinpointMapper} = { name: "name", diff --git a/Clava-JS/src-api/Query.test.ts b/Clava-JS/src-api/Query.test.ts index f204cfa14..477308a33 100644 --- a/Clava-JS/src-api/Query.test.ts +++ b/Clava-JS/src-api/Query.test.ts @@ -1,5 +1,5 @@ -import { registerSourceCode } from "lara-js/jest/jestHelpers.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { registerSourceCode } from "@specs-feup/lara/jest/jestHelpers.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FunctionJp, Loop } from "./Joinpoints.js"; const code = `void query_loop() { diff --git a/Clava-JS/src-api/clava/Clava.ts b/Clava-JS/src-api/clava/Clava.ts index bcf4ac1a0..7f8d52015 100644 --- a/Clava-JS/src-api/clava/Clava.ts +++ b/Clava-JS/src-api/clava/Clava.ts @@ -1,10 +1,10 @@ -import { wrapJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import Io from "lara-js/api/lara/Io.js"; -import JavaInterop from "lara-js/api/lara/JavaInterop.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import Query from "lara-js/api/weaver/Query.js"; -import Weaver from "lara-js/api/weaver/Weaver.js"; -import WeaverOptions from "lara-js/api/weaver/WeaverOptions.js"; +import { wrapJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import JavaInterop from "@specs-feup/lara/api/lara/JavaInterop.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; +import Weaver from "@specs-feup/lara/api/weaver/Weaver.js"; +import WeaverOptions from "@specs-feup/lara/api/weaver/WeaverOptions.js"; import { FileJp, Include, Joinpoint, Program } from "../Joinpoints.js"; import ClavaJavaTypes from "./ClavaJavaTypes.js"; import ClavaDataStore from "./util/ClavaDataStore.js"; diff --git a/Clava-JS/src-api/clava/ClavaCode.ts b/Clava-JS/src-api/clava/ClavaCode.ts index fe77c4af1..d50230427 100644 --- a/Clava-JS/src-api/clava/ClavaCode.ts +++ b/Clava-JS/src-api/clava/ClavaCode.ts @@ -1,7 +1,7 @@ -import Io from "lara-js/api/lara/Io.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FileJp, FunctionJp, @@ -59,7 +59,6 @@ export default class ClavaCode { let bodyCode = ""; for (const $file of Query.search(FileJp)) { - if ($file.isHeader) { continue; } diff --git a/Clava-JS/src-api/clava/ClavaJavaTypes.ts b/Clava-JS/src-api/clava/ClavaJavaTypes.ts index 3df7b6922..bd63ae75f 100644 --- a/Clava-JS/src-api/clava/ClavaJavaTypes.ts +++ b/Clava-JS/src-api/clava/ClavaJavaTypes.ts @@ -1,4 +1,6 @@ -import JavaTypes, { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; +import JavaTypes, { + JavaClasses, +} from "@specs-feup/lara/api/lara/util/JavaTypes.js"; // eslint-disable-next-line @typescript-eslint/no-namespace export namespace ClavaJavaClasses { diff --git a/Clava-JS/src-api/clava/ClavaJoinPoints.test.ts b/Clava-JS/src-api/clava/ClavaJoinPoints.test.ts index 4b2362809..f570a5eda 100644 --- a/Clava-JS/src-api/clava/ClavaJoinPoints.test.ts +++ b/Clava-JS/src-api/clava/ClavaJoinPoints.test.ts @@ -1,5 +1,5 @@ -import { registerSourceCode } from "lara-js/jest/jestHelpers.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { registerSourceCode } from "@specs-feup/lara/jest/jestHelpers.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { ExprStmt } from "../Joinpoints.js"; import ClavaJoinPoints from "./ClavaJoinPoints.js"; diff --git a/Clava-JS/src-api/clava/ClavaJoinPoints.ts b/Clava-JS/src-api/clava/ClavaJoinPoints.ts index c4bf0069e..14d5f0a42 100644 --- a/Clava-JS/src-api/clava/ClavaJoinPoints.ts +++ b/Clava-JS/src-api/clava/ClavaJoinPoints.ts @@ -1,9 +1,12 @@ -import { unwrapJoinPoint, wrapJoinPoint } from "lara-js/api/LaraJoinPoint.js"; +import { + unwrapJoinPoint, + wrapJoinPoint, +} from "@specs-feup/lara/api/LaraJoinPoint.js"; import { arrayFromArgs, flattenArgsArray, -} from "lara-js/api/lara/core/LaraCore.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; +} from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; import * as Joinpoints from "../Joinpoints.js"; import Clava from "./Clava.js"; import ClavaJavaTypes from "./ClavaJavaTypes.js"; diff --git a/Clava-JS/src-api/clava/Format.ts b/Clava-JS/src-api/clava/Format.ts index 289968a9e..a3793873d 100644 --- a/Clava-JS/src-api/clava/Format.ts +++ b/Clava-JS/src-api/clava/Format.ts @@ -1,19 +1,29 @@ -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; export default class Format { - static addPrefix(str: string, prefix: string): string { - return str.split("\n").map(line => prefix + line).join("\n"); - } + static addPrefix(str: string, prefix: string): string { + return str + .split("\n") + .map((line) => prefix + line) + .join("\n"); + } - static addSuffix(str: string, suffix: string): string { - return str.split("\n").map(line => line + suffix).join("\n"); - } + static addSuffix(str: string, suffix: string): string { + return str + .split("\n") + .map((line) => line + suffix) + .join("\n"); + } - static addPrefixAndSuffix(str: string, prefix: string, suffix: string): string { - return Format.addSuffix(Format.addPrefix(str, prefix), suffix); - } + static addPrefixAndSuffix( + str: string, + prefix: string, + suffix: string + ): string { + return Format.addSuffix(Format.addPrefix(str, prefix), suffix); + } - static escape(str: string): string { - return JavaTypes.SpecsStrings.escapeJson(str); - } -} \ No newline at end of file + static escape(str: string): string { + return JavaTypes.SpecsStrings.escapeJson(str); + } +} diff --git a/Clava-JS/src-api/clava/MathExtra.ts b/Clava-JS/src-api/clava/MathExtra.ts index 2893f3260..4a2a69272 100644 --- a/Clava-JS/src-api/clava/MathExtra.ts +++ b/Clava-JS/src-api/clava/MathExtra.ts @@ -1,4 +1,4 @@ -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; import { Expression } from "../Joinpoints.js"; import ClavaJavaTypes from "./ClavaJavaTypes.js"; diff --git a/Clava-JS/src-api/clava/analysis/AnalyserResult.test.ts b/Clava-JS/src-api/clava/analysis/AnalyserResult.test.ts index 8f9af39ac..7effbf021 100644 --- a/Clava-JS/src-api/clava/analysis/AnalyserResult.test.ts +++ b/Clava-JS/src-api/clava/analysis/AnalyserResult.test.ts @@ -1,5 +1,5 @@ import AnalyserResult from "./AnalyserResult.js"; -import ClavaJoinPoints from "clava-js/api/clava/ClavaJoinPoints.js"; +import ClavaJoinPoints from "@specs-feup/clava/api/clava/ClavaJoinPoints.js"; describe("AnalyserResult", () => { describe("getName", () => { diff --git a/Clava-JS/src-api/clava/analysis/CheckBasedAnalyser.ts b/Clava-JS/src-api/clava/analysis/CheckBasedAnalyser.ts index 8a61b4b57..9020b4bbe 100644 --- a/Clava-JS/src-api/clava/analysis/CheckBasedAnalyser.ts +++ b/Clava-JS/src-api/clava/analysis/CheckBasedAnalyser.ts @@ -1,7 +1,7 @@ import Analyser from "./Analyser.js"; import Checker from "./Checker.js"; import ResultFormatManager from "./ResultFormatManager.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FileJp, Joinpoint, Program } from "../../Joinpoints.js"; import AnalyserResult from "./AnalyserResult.js"; diff --git a/Clava-JS/src-api/clava/analysis/MessageGenerator.ts b/Clava-JS/src-api/clava/analysis/MessageGenerator.ts index 2eb5fabc2..25e663a2b 100644 --- a/Clava-JS/src-api/clava/analysis/MessageGenerator.ts +++ b/Clava-JS/src-api/clava/analysis/MessageGenerator.ts @@ -1,4 +1,4 @@ -import Io from "lara-js/api/lara/Io.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; import Clava from "../Clava.js"; import AnalyserResult from "./AnalyserResult.js"; import ResultList from "./ResultList.js"; diff --git a/Clava-JS/src-api/clava/analysis/analysers/BoundsAnalyser.ts b/Clava-JS/src-api/clava/analysis/analysers/BoundsAnalyser.ts index 5ced24d4d..9ab20fdf6 100644 --- a/Clava-JS/src-api/clava/analysis/analysers/BoundsAnalyser.ts +++ b/Clava-JS/src-api/clava/analysis/analysers/BoundsAnalyser.ts @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { ArrayAccess, ArrayType, diff --git a/Clava-JS/src-api/clava/analysis/analysers/DoubleFreeAnalyser.ts b/Clava-JS/src-api/clava/analysis/analysers/DoubleFreeAnalyser.ts index e2817dc35..43fd4198a 100644 --- a/Clava-JS/src-api/clava/analysis/analysers/DoubleFreeAnalyser.ts +++ b/Clava-JS/src-api/clava/analysis/analysers/DoubleFreeAnalyser.ts @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Call, diff --git a/Clava-JS/src-api/clava/cmake/CMaker.ts b/Clava-JS/src-api/clava/cmake/CMaker.ts index 965bab5b6..ee3a28971 100644 --- a/Clava-JS/src-api/clava/cmake/CMaker.ts +++ b/Clava-JS/src-api/clava/cmake/CMaker.ts @@ -1,18 +1,18 @@ -import Io from "lara-js/api/lara/Io.js"; -import Platforms from "lara-js/api/lara/Platforms.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Platforms from "@specs-feup/lara/api/lara/Platforms.js"; import { arrayFromArgs, debug, debugObject, -} from "lara-js/api/lara/core/LaraCore.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import ProcessExecutor from "lara-js/api/lara/util/ProcessExecutor.js"; +} from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import ProcessExecutor from "@specs-feup/lara/api/lara/util/ProcessExecutor.js"; import { FileJp } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import CMakerSources from "./CMakerSources.js"; import CMakerUtils from "./CMakerUtils.js"; import CMakeCompiler from "./compilers/CMakeCompiler.js"; -import BenchmarkCompilationEngine from "lara-js/api/lara/benchmark/BenchmarkCompilationEngine.js"; +import BenchmarkCompilationEngine from "@specs-feup/lara/api/lara/benchmark/BenchmarkCompilationEngine.js"; /** * Builds CMake configurations. diff --git a/Clava-JS/src-api/clava/cmake/CMakerSources.ts b/Clava-JS/src-api/clava/cmake/CMakerSources.ts index d240c210c..b824a7c7c 100644 --- a/Clava-JS/src-api/clava/cmake/CMakerSources.ts +++ b/Clava-JS/src-api/clava/cmake/CMakerSources.ts @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; import Clava from "../Clava.js"; import CMakerUtils from "./CMakerUtils.js"; @@ -178,6 +178,5 @@ export default class CMakerSources { } return prefix + values.join("\n" + space) + "\n)"; - - }; + } } diff --git a/Clava-JS/src-api/clava/cmake/CMakerUtils.ts b/Clava-JS/src-api/clava/cmake/CMakerUtils.ts index b650218ae..eff7c8890 100644 --- a/Clava-JS/src-api/clava/cmake/CMakerUtils.ts +++ b/Clava-JS/src-api/clava/cmake/CMakerUtils.ts @@ -1,4 +1,4 @@ -import ToolUtils from "lara-js/api/lara/tool/ToolUtils.js"; +import ToolUtils from "@specs-feup/lara/api/lara/tool/ToolUtils.js"; import CMakeCompiler from "./compilers/CMakeCompiler.js"; import GenericCMakeCompiler from "./compilers/GenericCMakeCompiler.js"; diff --git a/Clava-JS/src-api/clava/code/Inliner.ts b/Clava-JS/src-api/clava/code/Inliner.ts index cf947eda4..0ca32aa9d 100644 --- a/Clava-JS/src-api/clava/code/Inliner.ts +++ b/Clava-JS/src-api/clava/code/Inliner.ts @@ -1,6 +1,6 @@ -import { LaraJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Call, diff --git a/Clava-JS/src-api/clava/code/Outliner.ts b/Clava-JS/src-api/clava/code/Outliner.ts index 0b036dfc2..b999f497e 100644 --- a/Clava-JS/src-api/clava/code/Outliner.ts +++ b/Clava-JS/src-api/clava/code/Outliner.ts @@ -1,5 +1,5 @@ -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import Query from "lara-js/api/weaver/Query.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { AdjustedType, ArrayType, diff --git a/Clava-JS/src-api/clava/code/StatementDecomposer.ts b/Clava-JS/src-api/clava/code/StatementDecomposer.ts index 604661144..59e9b1b17 100644 --- a/Clava-JS/src-api/clava/code/StatementDecomposer.ts +++ b/Clava-JS/src-api/clava/code/StatementDecomposer.ts @@ -1,4 +1,4 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import { BinaryOp, Call, diff --git a/Clava-JS/src-api/clava/gprofer/Gprofer.ts b/Clava-JS/src-api/clava/gprofer/Gprofer.ts index 1d1e8a9f4..8b1201827 100644 --- a/Clava-JS/src-api/clava/gprofer/Gprofer.ts +++ b/Clava-JS/src-api/clava/gprofer/Gprofer.ts @@ -1,11 +1,13 @@ -import Io from "lara-js/api/lara/Io.js"; -import Strings from "lara-js/api/lara/Strings.js"; -import JavaTypes, { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import JavaTypes, { + JavaClasses, +} from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FileJp, FunctionJp } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import CMaker from "../cmake/CMaker.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; function GproferGetCxxFunction(signature: string) { return Query.search(FunctionJp, { diff --git a/Clava-JS/src-api/clava/graphs/ControlFlowGraph.ts b/Clava-JS/src-api/clava/graphs/ControlFlowGraph.ts index 80ee5e04d..84c6ef329 100644 --- a/Clava-JS/src-api/clava/graphs/ControlFlowGraph.ts +++ b/Clava-JS/src-api/clava/graphs/ControlFlowGraph.ts @@ -1,5 +1,5 @@ -import Graph from "lara-js/api/lara/graphs/Graph.js"; -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; +import Graph from "@specs-feup/lara/api/lara/graphs/Graph.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; import { Statement } from "../../Joinpoints.js"; import CfgBuilder from "./cfg/CfgBuilder.js"; diff --git a/Clava-JS/src-api/clava/graphs/StaticCallGraph.ts b/Clava-JS/src-api/clava/graphs/StaticCallGraph.ts index facb6903b..a37f397f0 100644 --- a/Clava-JS/src-api/clava/graphs/StaticCallGraph.ts +++ b/Clava-JS/src-api/clava/graphs/StaticCallGraph.ts @@ -1,7 +1,7 @@ -import DotFormatter from "lara-js/api/lara/graphs/DotFormatter.js"; -import Graph from "lara-js/api/lara/graphs/Graph.js"; -import Graphs from "lara-js/api/lara/graphs/Graphs.js"; -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; +import DotFormatter from "@specs-feup/lara/api/lara/graphs/DotFormatter.js"; +import Graph from "@specs-feup/lara/api/lara/graphs/Graph.js"; +import Graphs from "@specs-feup/lara/api/lara/graphs/Graphs.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; import { FunctionJp, Joinpoint } from "../../Joinpoints.js"; import ScgNodeData from "./scg/ScgNodeData.js"; import StaticCallGraphBuilder from "./scg/StaticCallGraphBuilder.js"; diff --git a/Clava-JS/src-api/clava/graphs/cfg/CfgBuilder.ts b/Clava-JS/src-api/clava/graphs/cfg/CfgBuilder.ts index 14be9eeb5..4273bd9ac 100644 --- a/Clava-JS/src-api/clava/graphs/cfg/CfgBuilder.ts +++ b/Clava-JS/src-api/clava/graphs/cfg/CfgBuilder.ts @@ -1,7 +1,7 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Graphs from "lara-js/api/lara/graphs/Graphs.js"; -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Graphs from "@specs-feup/lara/api/lara/graphs/Graphs.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Break, Continue, @@ -30,7 +30,7 @@ import ScopeNodeData from "./nodedata/ScopeNodeData.js"; import SwitchData from "./nodedata/SwitchData.js"; import GotoData from "./nodedata/GotoData.js"; import LabelData from "./nodedata/LabelData.js"; -import { LaraJoinPoint } from "lara-js/api/LaraJoinPoint.js"; +import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; export default class CfgBuilder { /** diff --git a/Clava-JS/src-api/clava/graphs/cfg/CfgEdge.ts b/Clava-JS/src-api/clava/graphs/cfg/CfgEdge.ts index 141c5108e..ec0c59121 100644 --- a/Clava-JS/src-api/clava/graphs/cfg/CfgEdge.ts +++ b/Clava-JS/src-api/clava/graphs/cfg/CfgEdge.ts @@ -1,4 +1,4 @@ -import EdgeData from "lara-js/api/lara/graphs/EdgeData.js"; +import EdgeData from "@specs-feup/lara/api/lara/graphs/EdgeData.js"; import CfgEdgeType from "./CfgEdgeType.js"; /** diff --git a/Clava-JS/src-api/clava/graphs/cfg/CfgNodeData.ts b/Clava-JS/src-api/clava/graphs/cfg/CfgNodeData.ts index 3d4868167..c35eb7903 100644 --- a/Clava-JS/src-api/clava/graphs/cfg/CfgNodeData.ts +++ b/Clava-JS/src-api/clava/graphs/cfg/CfgNodeData.ts @@ -1,11 +1,13 @@ -import NodeData from "lara-js/api/lara/graphs/NodeData.js"; +import NodeData from "@specs-feup/lara/api/lara/graphs/NodeData.js"; import { Statement } from "../../../Joinpoints.js"; import CfgNodeType from "./CfgNodeType.js"; /** * The data of a CFG node. */ -export default class CfgNodeData extends NodeData { +export default class CfgNodeData< + T extends Statement = Statement, +> extends NodeData { /** * The statement join point of the CFG node */ diff --git a/Clava-JS/src-api/clava/graphs/cfg/CfgUtils.ts b/Clava-JS/src-api/clava/graphs/cfg/CfgUtils.ts index f645d41a9..625108b46 100644 --- a/Clava-JS/src-api/clava/graphs/cfg/CfgUtils.ts +++ b/Clava-JS/src-api/clava/graphs/cfg/CfgUtils.ts @@ -1,4 +1,4 @@ -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; import { Break, Case, diff --git a/Clava-JS/src-api/clava/graphs/cfg/NextCfgNode.ts b/Clava-JS/src-api/clava/graphs/cfg/NextCfgNode.ts index 0d43b933f..bd1f944bd 100644 --- a/Clava-JS/src-api/clava/graphs/cfg/NextCfgNode.ts +++ b/Clava-JS/src-api/clava/graphs/cfg/NextCfgNode.ts @@ -1,4 +1,4 @@ -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; import { Case, FunctionJp, @@ -24,7 +24,11 @@ export default class NextCfgNode { */ private endNode: cytoscape.NodeSingular; - constructor($entryPoint: Statement, nodes: Map, endNode: cytoscape.NodeSingular) { + constructor( + $entryPoint: Statement, + nodes: Map, + endNode: cytoscape.NodeSingular + ) { this.entryPoint = $entryPoint; this.nodes = nodes; this.endNode = endNode; @@ -143,7 +147,6 @@ export default class NextCfgNode { return rightStmts[0]; } - // If scope parent is not a statement, there is no next statement if ($scopeParent instanceof Statement) { // Return next statement of parent statement diff --git a/Clava-JS/src-api/clava/graphs/scg/ScgEdgeData.ts b/Clava-JS/src-api/clava/graphs/scg/ScgEdgeData.ts index fa18426ae..1541821c6 100644 --- a/Clava-JS/src-api/clava/graphs/scg/ScgEdgeData.ts +++ b/Clava-JS/src-api/clava/graphs/scg/ScgEdgeData.ts @@ -1,4 +1,4 @@ -import EdgeData from "lara-js/api/lara/graphs/EdgeData.js"; +import EdgeData from "@specs-feup/lara/api/lara/graphs/EdgeData.js"; import { Call } from "../../../Joinpoints.js"; export default class ScgEdgeData extends EdgeData { diff --git a/Clava-JS/src-api/clava/graphs/scg/ScgNodeData.ts b/Clava-JS/src-api/clava/graphs/scg/ScgNodeData.ts index df60cf3cc..147227ec2 100644 --- a/Clava-JS/src-api/clava/graphs/scg/ScgNodeData.ts +++ b/Clava-JS/src-api/clava/graphs/scg/ScgNodeData.ts @@ -1,5 +1,5 @@ -import NodeData from "lara-js/api/lara/graphs/NodeData.js"; -import Query from "lara-js/api/weaver/Query.js"; +import NodeData from "@specs-feup/lara/api/lara/graphs/NodeData.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FunctionJp } from "../../../Joinpoints.js"; export default class ScgNodeData extends NodeData { diff --git a/Clava-JS/src-api/clava/graphs/scg/StaticCallGraphBuilder.ts b/Clava-JS/src-api/clava/graphs/scg/StaticCallGraphBuilder.ts index 4c58fa491..a21911db4 100644 --- a/Clava-JS/src-api/clava/graphs/scg/StaticCallGraphBuilder.ts +++ b/Clava-JS/src-api/clava/graphs/scg/StaticCallGraphBuilder.ts @@ -1,7 +1,7 @@ -import { LaraJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import Graphs from "lara-js/api/lara/graphs/Graphs.js"; -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import Graphs from "@specs-feup/lara/api/lara/graphs/Graphs.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FunctionJp, Joinpoint, Program } from "../../../Joinpoints.js"; import ScgEdgeData from "./ScgEdgeData.js"; import ScgNodeData from "./ScgNodeData.js"; diff --git a/Clava-JS/src-api/clava/hls/HLSAnalysis.ts b/Clava-JS/src-api/clava/hls/HLSAnalysis.ts index 820541ecd..10dec1258 100644 --- a/Clava-JS/src-api/clava/hls/HLSAnalysis.ts +++ b/Clava-JS/src-api/clava/hls/HLSAnalysis.ts @@ -1,122 +1,131 @@ -import { unwrapJoinPoint } from "lara-js/api/LaraJoinPoint.js"; +import { unwrapJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; import { FunctionJp } from "../../Joinpoints.js"; import ClavaJavaTypes from "../ClavaJavaTypes.js"; export default class HLSAnalysis { - -/** - * Applies a set of Vivado HLS directives to a provided function using a set - * of strategies to select and configure those directives. This function applies the - * main optimization flow, which is comprised of the following strategies, by this order: - * - Function Inlining - * - Array Streaming - * - Loop strategies (loop unrolling, pipelining and array partitioning) - * For a description of how each strategy works, as well as for a standalone version of - * each of these strategies, please consult the other methods of this class. - * - * @param func - A JoinPoint of the function to analyze - * @param options - An optional argument to specify the HLS options. The format - * is the following: \{"B": 2, "N": 32, "P": 64\} - * If not specified, the compiler will use the values provided in the example above. - * - */ -static applyGenericStrategies(func: FunctionJp, options: {B?: number, N?: number, P?: number} = {}) { + /** + * Applies a set of Vivado HLS directives to a provided function using a set + * of strategies to select and configure those directives. This function applies the + * main optimization flow, which is comprised of the following strategies, by this order: + * - Function Inlining + * - Array Streaming + * - Loop strategies (loop unrolling, pipelining and array partitioning) + * For a description of how each strategy works, as well as for a standalone version of + * each of these strategies, please consult the other methods of this class. + * + * @param func - A JoinPoint of the function to analyze + * @param options - An optional argument to specify the HLS options. The format + * is the following: \{"B": 2, "N": 32, "P": 64\} + * If not specified, the compiler will use the values provided in the example above. + * + */ + static applyGenericStrategies( + func: FunctionJp, + options: { B?: number; N?: number; P?: number } = {} + ) { ClavaJavaTypes.HighLevelSynthesisAPI.applyGenericStrategies( unwrapJoinPoint(func), JSON.stringify(options) ); -} + } - -/** - * Applies the function inlining directive to every called function. - * It works by calculating the cost of both the called function and the callee, - * in which cost is defined as the total number of array loads on the total lifetime - * of the function. This is then fed to the formula: - * - * calleeCost \> (callFrequency * calledCost) / B - * - * If this function is true, the function is inlined. Factor B is configurable, and allows - * for this formula to be more restrictive/permissive, based on the user's needs. The - * default value is 2. - * - * - * @param func - A JoinPoint of the function to analyze - * @param B - A positive real number to control the heuristic's aggressiveness - * */ -static applyFunctionInlining(func: FunctionJp, B: number): void { + /** + * Applies the function inlining directive to every called function. + * It works by calculating the cost of both the called function and the callee, + * in which cost is defined as the total number of array loads on the total lifetime + * of the function. This is then fed to the formula: + * + * calleeCost \> (callFrequency * calledCost) / B + * + * If this function is true, the function is inlined. Factor B is configurable, and allows + * for this formula to be more restrictive/permissive, based on the user's needs. The + * default value is 2. + * + * + * @param func - A JoinPoint of the function to analyze + * @param B - A positive real number to control the heuristic's aggressiveness + * */ + static applyFunctionInlining(func: FunctionJp, B: number): void { ClavaJavaTypes.HighLevelSynthesisAPI.applyFunctionInlining( unwrapJoinPoint(func), B.toString() ); -} + } -/** - * This strategy analyzes every input/output array of the function, and - * tries to see if they can be implemented as a FIFO. To do this, the strategy - * makes a series of checks to see whether the array can be implemented as such. - * These checks are: - * - Check if the array only has either loads or stores operations - * - Check if the array is always accessed sequentially (limited by the information - * available at compile time) - * - Check whether each array position is accessed only once during the entire function - * lifetime - * If all these checks apply, the array is implemented as a FIFO using a Vivado HLS directive. - * - * @param func - A JoinPoint of the function to analyze - * */ -static applyArrayStreaming(func: FunctionJp): void { - ClavaJavaTypes.HighLevelSynthesisAPI.applyArrayStreaming(unwrapJoinPoint(func)); -} - -/** - * Analyzes every loop nest of a function and applies loop optimizations. These - * optimizations are a combination of loop unrolling and loop pipelining. For the latter - * to be efficient, array partitioning is also applied. This strategy works by always - * unrolling the innermost loop of every nest, with a resource limitation directive to - * prevent excessive resource usage. Then, if the number of iterations of the outermost - * loop is less than 4, that loop is also unrolled, and so on. However, this is an edge case, - * since this rarely happens; the outermost loop is, instead, pipelined. The array partitioning - * is done in two ways: if an array is less than 4096 bytes, it is mapped into registers; otherwise, - * it is partitioned into P partitions using a cyclic strategy. - * - * - * @param func - A JoinPoint of the function to analyze - * @param P - The number of partitions to use. 64 is the default. - * */ -static applyLoopStrategies(func: FunctionJp, P: number): void { - ClavaJavaTypes.HighLevelSynthesisAPI.applyLoopStrategies(unwrapJoinPoint(func), P.toString()); -} + /** + * This strategy analyzes every input/output array of the function, and + * tries to see if they can be implemented as a FIFO. To do this, the strategy + * makes a series of checks to see whether the array can be implemented as such. + * These checks are: + * - Check if the array only has either loads or stores operations + * - Check if the array is always accessed sequentially (limited by the information + * available at compile time) + * - Check whether each array position is accessed only once during the entire function + * lifetime + * If all these checks apply, the array is implemented as a FIFO using a Vivado HLS directive. + * + * @param func - A JoinPoint of the function to analyze + * */ + static applyArrayStreaming(func: FunctionJp): void { + ClavaJavaTypes.HighLevelSynthesisAPI.applyArrayStreaming( + unwrapJoinPoint(func) + ); + } -/** - * Applies the load/stores strategy to simple loops. A simple loop is defined as - * a function with only one loop with no nests, and in which every array is either only - * loaded from or stored to in each iteration. This method can validate whether the provided - * function is a simple loop or not. If it is one, then it applies three HLS directives in tandem: - * it unrolls the loop by a factor N (called the load/stores factor), it partitions each array by - * that same factor N using a cyclic strategy and finally it pipelines the loop. This strategy is - * better than the other generic strategies for this type of function. Generally, larger values lead - * to a better speedup, although there are exceptions. Therefore, it is recommended for users to - * experiment with different values if results are unsatisfactory (the default value is 32). - * - * - * @param func - A JoinPoint of the function to analyze - * @param N - A positive integer value for the load/stores factor - * */ -static applyLoadStoresStrategy(func: FunctionJp, N: number): void { - ClavaJavaTypes.HighLevelSynthesisAPI.applyLoadStoresStrategy(unwrapJoinPoint(func), N.toString()); -} + /** + * Analyzes every loop nest of a function and applies loop optimizations. These + * optimizations are a combination of loop unrolling and loop pipelining. For the latter + * to be efficient, array partitioning is also applied. This strategy works by always + * unrolling the innermost loop of every nest, with a resource limitation directive to + * prevent excessive resource usage. Then, if the number of iterations of the outermost + * loop is less than 4, that loop is also unrolled, and so on. However, this is an edge case, + * since this rarely happens; the outermost loop is, instead, pipelined. The array partitioning + * is done in two ways: if an array is less than 4096 bytes, it is mapped into registers; otherwise, + * it is partitioned into P partitions using a cyclic strategy. + * + * + * @param func - A JoinPoint of the function to analyze + * @param P - The number of partitions to use. 64 is the default. + * */ + static applyLoopStrategies(func: FunctionJp, P: number): void { + ClavaJavaTypes.HighLevelSynthesisAPI.applyLoopStrategies( + unwrapJoinPoint(func), + P.toString() + ); + } -/** - * Checks whether a function can be instrumented. Only workds for old versions - * of the trace2c tool. - * - * @param func - A JoinPoint of the function to analyze - * @returns Whether the function can be or not instrumented - * */ -static canBeInstrumented(func: FunctionJp): boolean { - return ClavaJavaTypes.HighLevelSynthesisAPI.canBeInstrumented(unwrapJoinPoint(func)); -} + /** + * Applies the load/stores strategy to simple loops. A simple loop is defined as + * a function with only one loop with no nests, and in which every array is either only + * loaded from or stored to in each iteration. This method can validate whether the provided + * function is a simple loop or not. If it is one, then it applies three HLS directives in tandem: + * it unrolls the loop by a factor N (called the load/stores factor), it partitions each array by + * that same factor N using a cyclic strategy and finally it pipelines the loop. This strategy is + * better than the other generic strategies for this type of function. Generally, larger values lead + * to a better speedup, although there are exceptions. Therefore, it is recommended for users to + * experiment with different values if results are unsatisfactory (the default value is 32). + * + * + * @param func - A JoinPoint of the function to analyze + * @param N - A positive integer value for the load/stores factor + * */ + static applyLoadStoresStrategy(func: FunctionJp, N: number): void { + ClavaJavaTypes.HighLevelSynthesisAPI.applyLoadStoresStrategy( + unwrapJoinPoint(func), + N.toString() + ); + } + /** + * Checks whether a function can be instrumented. Only workds for old versions + * of the trace2c tool. + * + * @param func - A JoinPoint of the function to analyze + * @returns Whether the function can be or not instrumented + * */ + static canBeInstrumented(func: FunctionJp): boolean { + return ClavaJavaTypes.HighLevelSynthesisAPI.canBeInstrumented( + unwrapJoinPoint(func) + ); + } } - diff --git a/Clava-JS/src-api/clava/hls/MathAnalysis.ts b/Clava-JS/src-api/clava/hls/MathAnalysis.ts index b2ba20c19..53ee2dd01 100644 --- a/Clava-JS/src-api/clava/hls/MathAnalysis.ts +++ b/Clava-JS/src-api/clava/hls/MathAnalysis.ts @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BuiltinType, Call, Expression } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; import MathHInfo, { MathInfo } from "./MathHInfo.js"; diff --git a/Clava-JS/src-api/clava/hls/MathHInfo.ts b/Clava-JS/src-api/clava/hls/MathHInfo.ts index 048002333..32b2e4edf 100644 --- a/Clava-JS/src-api/clava/hls/MathHInfo.ts +++ b/Clava-JS/src-api/clava/hls/MathHInfo.ts @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp, Program } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; @@ -49,9 +49,7 @@ export default class MathHInfo { Clava.rebuild(); const results = []; - for (const $fn of Query.search(FileJp, "math_copy.h").search( - FunctionJp - )) { + for (const $fn of Query.search(FileJp, "math_copy.h").search(FunctionJp)) { const paramTypes = []; for (const $param of $fn.params) { paramTypes.push($param.type.code); diff --git a/Clava-JS/src-api/clava/hls/TraceInstrumentation.ts b/Clava-JS/src-api/clava/hls/TraceInstrumentation.ts index 7c1de50db..9f810b382 100644 --- a/Clava-JS/src-api/clava/hls/TraceInstrumentation.ts +++ b/Clava-JS/src-api/clava/hls/TraceInstrumentation.ts @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { ArrayAccess, BinaryOp, diff --git a/Clava-JS/src-api/clava/liveness/LivenessAnalyser.ts b/Clava-JS/src-api/clava/liveness/LivenessAnalyser.ts index 39101c095..e4b773569 100644 --- a/Clava-JS/src-api/clava/liveness/LivenessAnalyser.ts +++ b/Clava-JS/src-api/clava/liveness/LivenessAnalyser.ts @@ -1,4 +1,4 @@ -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; import { Case, Expression, If, Statement, Switch } from "../../Joinpoints.js"; import ControlFlowGraph from "../graphs/ControlFlowGraph.js"; import CfgNodeData from "../graphs/cfg/CfgNodeData.js"; @@ -73,7 +73,7 @@ export default class LivenessAnalyser { Map>, Map>, Map>, - Map> + Map>, ] { this.computeDefs(); this.computeUses(); diff --git a/Clava-JS/src-api/clava/liveness/LivenessAnalysis.ts b/Clava-JS/src-api/clava/liveness/LivenessAnalysis.ts index ceb420292..1d571e565 100644 --- a/Clava-JS/src-api/clava/liveness/LivenessAnalysis.ts +++ b/Clava-JS/src-api/clava/liveness/LivenessAnalysis.ts @@ -1,4 +1,4 @@ -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; import ControlFlowGraph from "../graphs/ControlFlowGraph.js"; import LivenessAnalyser from "./LivenessAnalyser.js"; diff --git a/Clava-JS/src-api/clava/liveness/LivenessUtils.ts b/Clava-JS/src-api/clava/liveness/LivenessUtils.ts index bb5d67684..998b33546 100644 --- a/Clava-JS/src-api/clava/liveness/LivenessUtils.ts +++ b/Clava-JS/src-api/clava/liveness/LivenessUtils.ts @@ -1,6 +1,6 @@ -import { LaraJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import cytoscape from "lara-js/api/libs/cytoscape-3.26.0.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import cytoscape from "@specs-feup/lara/api/libs/cytoscape-3.26.0.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Expression, diff --git a/Clava-JS/src-api/clava/memoi/MemoiAnalysis.ts b/Clava-JS/src-api/clava/memoi/MemoiAnalysis.ts index 8b615360f..937260974 100644 --- a/Clava-JS/src-api/clava/memoi/MemoiAnalysis.ts +++ b/Clava-JS/src-api/clava/memoi/MemoiAnalysis.ts @@ -1,6 +1,6 @@ -import { JSONtoFile } from "lara-js/api/core/output.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { JSONtoFile } from "@specs-feup/lara/api/core/output.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FunctionJp, Type, Varref } from "../../Joinpoints.js"; import MemoiTarget from "./MemoiTarget.js"; import MemoiUtils from "./MemoiUtils.js"; diff --git a/Clava-JS/src-api/clava/memoi/MemoiGen.ts b/Clava-JS/src-api/clava/memoi/MemoiGen.ts index 8d856dc07..873ac6d74 100644 --- a/Clava-JS/src-api/clava/memoi/MemoiGen.ts +++ b/Clava-JS/src-api/clava/memoi/MemoiGen.ts @@ -1,8 +1,8 @@ -import Io from "lara-js/api/lara/Io.js"; -import { arrayFromArgs } from "lara-js/api/lara/core/LaraCore.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import { TimerUnit } from "lara-js/api/lara/util/TimeUnits.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { arrayFromArgs } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import { TimerUnit } from "@specs-feup/lara/api/lara/util/TimeUnits.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp } from "../../Joinpoints.js"; import Timer from "../../lara/code/Timer.js"; import ClavaJavaTypes, { ClavaJavaClasses } from "../ClavaJavaTypes.js"; diff --git a/Clava-JS/src-api/clava/memoi/MemoiProf.ts b/Clava-JS/src-api/clava/memoi/MemoiProf.ts index 8ab60699b..0388da5cb 100644 --- a/Clava-JS/src-api/clava/memoi/MemoiProf.ts +++ b/Clava-JS/src-api/clava/memoi/MemoiProf.ts @@ -1,6 +1,6 @@ -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; -import Query from "lara-js/api/weaver/Query.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp, Scope, Type } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/Clava-JS/src-api/clava/memoi/MemoiTarget.ts b/Clava-JS/src-api/clava/memoi/MemoiTarget.ts index 992e1a93b..c6aec5019 100644 --- a/Clava-JS/src-api/clava/memoi/MemoiTarget.ts +++ b/Clava-JS/src-api/clava/memoi/MemoiTarget.ts @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FunctionJp } from "../../Joinpoints.js"; import MemoiUtils from "./MemoiUtils.js"; diff --git a/Clava-JS/src-api/clava/memoi/_MemoiGenHelper.ts b/Clava-JS/src-api/clava/memoi/_MemoiGenHelper.ts index 696d556e0..bb6452cad 100644 --- a/Clava-JS/src-api/clava/memoi/_MemoiGenHelper.ts +++ b/Clava-JS/src-api/clava/memoi/_MemoiGenHelper.ts @@ -1,6 +1,6 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp, Statement } from "../../Joinpoints.js"; import ClavaJavaTypes, { ClavaJavaClasses } from "../ClavaJavaTypes.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/Clava-JS/src-api/clava/opencl/KernelReplacer.ts b/Clava-JS/src-api/clava/opencl/KernelReplacer.ts index d7e472c8b..3f85c2bab 100644 --- a/Clava-JS/src-api/clava/opencl/KernelReplacer.ts +++ b/Clava-JS/src-api/clava/opencl/KernelReplacer.ts @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import Strings from "lara-js/api/lara/Strings.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; import { BuiltinType, Call, diff --git a/Clava-JS/src-api/clava/opencl/KernelReplacerAuto.ts b/Clava-JS/src-api/clava/opencl/KernelReplacerAuto.ts index 99e3f2449..fda9724da 100644 --- a/Clava-JS/src-api/clava/opencl/KernelReplacerAuto.ts +++ b/Clava-JS/src-api/clava/opencl/KernelReplacerAuto.ts @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import Strings from "lara-js/api/lara/Strings.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, Pragma } from "../../Joinpoints.js"; import KernelReplacer, { OpenClKernelReplacerConfiguration, diff --git a/Clava-JS/src-api/clava/opencl/OpenCLCall.ts b/Clava-JS/src-api/clava/opencl/OpenCLCall.ts index 07d973a39..ee33f6d8c 100644 --- a/Clava-JS/src-api/clava/opencl/OpenCLCall.ts +++ b/Clava-JS/src-api/clava/opencl/OpenCLCall.ts @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import Platforms from "lara-js/api/lara/Platforms.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Platforms from "@specs-feup/lara/api/lara/Platforms.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; import { Call, FileJp, FunctionJp } from "../../Joinpoints.js"; import OpenCLCallVariables from "./OpenCLCallVariables.js"; diff --git a/Clava-JS/src-api/clava/opt/Inlining.ts b/Clava-JS/src-api/clava/opt/Inlining.ts index f0e4fb1c5..0815cd4b6 100644 --- a/Clava-JS/src-api/clava/opt/Inlining.ts +++ b/Clava-JS/src-api/clava/opt/Inlining.ts @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FunctionJp, Joinpoint } from "../../Joinpoints.js"; import Inliner from "../code/Inliner.js"; import NormalizeToSubset from "./NormalizeToSubset.js"; diff --git a/Clava-JS/src-api/clava/opt/NormalizeToSubset.ts b/Clava-JS/src-api/clava/opt/NormalizeToSubset.ts index 2a51e89c5..9d190a9ad 100644 --- a/Clava-JS/src-api/clava/opt/NormalizeToSubset.ts +++ b/Clava-JS/src-api/clava/opt/NormalizeToSubset.ts @@ -1,5 +1,5 @@ -import { LaraJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Joinpoint } from "../../Joinpoints.js"; import SimplifyAssignment from "../code/SimplifyAssignment.js"; import StatementDecomposer from "../code/StatementDecomposer.js"; diff --git a/Clava-JS/src-api/clava/parser/BatchParser.ts b/Clava-JS/src-api/clava/parser/BatchParser.ts index 4359f6539..3b0a1f2da 100644 --- a/Clava-JS/src-api/clava/parser/BatchParser.ts +++ b/Clava-JS/src-api/clava/parser/BatchParser.ts @@ -1,11 +1,11 @@ -import Io from "lara-js/api/lara/Io.js"; -import Check from "lara-js/api/lara/Check.js"; -import System from "lara-js/api/lara/System.js"; -import Strings from "lara-js/api/lara/Strings.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Check from "@specs-feup/lara/api/lara/Check.js"; +import System from "@specs-feup/lara/api/lara/System.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; import Clava from "../Clava.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import { ClavaException, FileJp } from "../../Joinpoints.js"; /** diff --git a/Clava-JS/src-api/clava/pass/DecomposeDeclStmt.ts b/Clava-JS/src-api/clava/pass/DecomposeDeclStmt.ts index 70c854f48..4835cbe81 100644 --- a/Clava-JS/src-api/clava/pass/DecomposeDeclStmt.ts +++ b/Clava-JS/src-api/clava/pass/DecomposeDeclStmt.ts @@ -1,5 +1,5 @@ -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { DeclStmt, Joinpoint } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/Clava-JS/src-api/clava/pass/DecomposeVarDeclarations.ts b/Clava-JS/src-api/clava/pass/DecomposeVarDeclarations.ts index e2404cfb5..d83cf5929 100644 --- a/Clava-JS/src-api/clava/pass/DecomposeVarDeclarations.ts +++ b/Clava-JS/src-api/clava/pass/DecomposeVarDeclarations.ts @@ -1,5 +1,5 @@ -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { ArrayType, Joinpoint, diff --git a/Clava-JS/src-api/clava/pass/LocalStaticToGlobal.ts b/Clava-JS/src-api/clava/pass/LocalStaticToGlobal.ts index 51e1bcaff..d7663524d 100644 --- a/Clava-JS/src-api/clava/pass/LocalStaticToGlobal.ts +++ b/Clava-JS/src-api/clava/pass/LocalStaticToGlobal.ts @@ -1,6 +1,6 @@ -import PassTransformationError from "lara-js/api/lara/pass/PassTransformationError.js"; -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import PassTransformationError from "@specs-feup/lara/api/lara/pass/PassTransformationError.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { DeclStmt, FunctionJp, diff --git a/Clava-JS/src-api/clava/pass/SimplifyLoops.ts b/Clava-JS/src-api/clava/pass/SimplifyLoops.ts index e0377cf81..5f68dccfd 100644 --- a/Clava-JS/src-api/clava/pass/SimplifyLoops.ts +++ b/Clava-JS/src-api/clava/pass/SimplifyLoops.ts @@ -1,5 +1,5 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { DeclStmt, ExprStmt, Joinpoint, Loop } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; import DoToWhileStmt from "../code/DoToWhileStmt.js"; diff --git a/Clava-JS/src-api/clava/pass/SimplifyReturnStmts.ts b/Clava-JS/src-api/clava/pass/SimplifyReturnStmts.ts index 853384edf..d217f68a0 100644 --- a/Clava-JS/src-api/clava/pass/SimplifyReturnStmts.ts +++ b/Clava-JS/src-api/clava/pass/SimplifyReturnStmts.ts @@ -1,6 +1,6 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Joinpoint, ReturnStmt } from "../../Joinpoints.js"; import StatementDecomposer from "../code/StatementDecomposer.js"; diff --git a/Clava-JS/src-api/clava/pass/SimplifySelectionStmts.ts b/Clava-JS/src-api/clava/pass/SimplifySelectionStmts.ts index e6bdaefce..4f5d434c4 100644 --- a/Clava-JS/src-api/clava/pass/SimplifySelectionStmts.ts +++ b/Clava-JS/src-api/clava/pass/SimplifySelectionStmts.ts @@ -1,6 +1,6 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { If, Joinpoint } from "../../Joinpoints.js"; import StatementDecomposer from "../code/StatementDecomposer.js"; diff --git a/Clava-JS/src-api/clava/pass/SingleReturnFunction.ts b/Clava-JS/src-api/clava/pass/SingleReturnFunction.ts index f90e29b61..342031788 100644 --- a/Clava-JS/src-api/clava/pass/SingleReturnFunction.ts +++ b/Clava-JS/src-api/clava/pass/SingleReturnFunction.ts @@ -1,6 +1,6 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BuiltinType, FunctionJp, @@ -25,10 +25,7 @@ export default class SingleReturnFunction extends Pass { return this.new_result($jp, false); } const $body = $jp.body; - const $returnStmts = Query.searchFrom( - $body, - ReturnStmt - ).get(); + const $returnStmts = Query.searchFrom($body, ReturnStmt).get(); if ( $returnStmts.length === 0 || ($returnStmts.length === 1 && $body.lastChild instanceof ReturnStmt) diff --git a/Clava-JS/src-api/clava/pass/TransformSwitchToIf.ts b/Clava-JS/src-api/clava/pass/TransformSwitchToIf.ts index 80e25ddb4..2201ce999 100644 --- a/Clava-JS/src-api/clava/pass/TransformSwitchToIf.ts +++ b/Clava-JS/src-api/clava/pass/TransformSwitchToIf.ts @@ -1,7 +1,7 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { Break, Case, @@ -11,7 +11,7 @@ import { Statement, Switch, } from "../../Joinpoints.js"; -import { LaraJoinPoint } from "lara-js/api/LaraJoinPoint.js"; +import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; /** * Transforms a switch statement into an if statement. @@ -249,8 +249,7 @@ export default class TransformSwitchToIf extends SimplePass { enclosingStmt: (enclosingStmt: LaraJoinPoint) => (enclosingStmt as Statement).astId === $jp.astId, }); - for (const $break of $breakStmts) - $break.replaceWith($switchExitGoTo); + for (const $break of $breakStmts) $break.replaceWith($switchExitGoTo); } /** diff --git a/Clava-JS/src-api/clava/stats/OpsCounter.ts b/Clava-JS/src-api/clava/stats/OpsCounter.ts index 8a5e2b557..8d3eccaf7 100644 --- a/Clava-JS/src-api/clava/stats/OpsCounter.ts +++ b/Clava-JS/src-api/clava/stats/OpsCounter.ts @@ -1,7 +1,7 @@ import ClavaJoinPoints from "../ClavaJoinPoints.js"; import GlobalVariable from "../code/GlobalVariable.js"; -import Query from "lara-js/api/weaver/Query.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; import Logger from "../../lara/code/Logger.js"; import { BuiltinType, diff --git a/Clava-JS/src-api/clava/stats/StaticOpsCounter.ts b/Clava-JS/src-api/clava/stats/StaticOpsCounter.ts index 96acb4f3b..afdf1fff7 100644 --- a/Clava-JS/src-api/clava/stats/StaticOpsCounter.ts +++ b/Clava-JS/src-api/clava/stats/StaticOpsCounter.ts @@ -1,5 +1,5 @@ -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; -import Query from "lara-js/api/weaver/Query.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, BuiltinType, diff --git a/Clava-JS/src-api/clava/util/ClavaDataStore.ts b/Clava-JS/src-api/clava/util/ClavaDataStore.ts index 3761bb803..5e1a6e87a 100644 --- a/Clava-JS/src-api/clava/util/ClavaDataStore.ts +++ b/Clava-JS/src-api/clava/util/ClavaDataStore.ts @@ -1,9 +1,11 @@ -import WeaverDataStore from "lara-js/api/weaver/util/WeaverDataStore.js"; +import WeaverDataStore from "@specs-feup/lara/api/weaver/util/WeaverDataStore.js"; import ClavaJavaTypes from "../ClavaJavaTypes.js"; -import JavaTypes, { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import Io from "lara-js/api/lara/Io.js"; -import DataStore from "lara-js/api/lara/util/DataStore.js"; -import { arrayFromArgs } from "lara-js/api/lara/core/LaraCore.js"; +import JavaTypes, { + JavaClasses, +} from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import DataStore from "@specs-feup/lara/api/lara/util/DataStore.js"; +import { arrayFromArgs } from "@specs-feup/lara/api/lara/core/LaraCore.js"; /** * DataStore used in Clava. diff --git a/Clava-JS/src-api/clava/util/CodeInserter.ts b/Clava-JS/src-api/clava/util/CodeInserter.ts index 2ac64111b..f37b0c912 100644 --- a/Clava-JS/src-api/clava/util/CodeInserter.ts +++ b/Clava-JS/src-api/clava/util/CodeInserter.ts @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import LineInserter from "lara-js/api/lara/util/LineInserter.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import LineInserter from "@specs-feup/lara/api/lara/util/LineInserter.js"; import { FileJp } from "../../Joinpoints.js"; import Clava from "../Clava.js"; diff --git a/Clava-JS/src-api/clava/util/FileIterator.ts b/Clava-JS/src-api/clava/util/FileIterator.ts index 3d27fee6a..21267c0aa 100644 --- a/Clava-JS/src-api/clava/util/FileIterator.ts +++ b/Clava-JS/src-api/clava/util/FileIterator.ts @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; import { FileJp } from "../../Joinpoints.js"; import Clava from "../Clava.js"; diff --git a/Clava-JS/src-api/clava/vitishls/VitisHls.ts b/Clava-JS/src-api/clava/vitishls/VitisHls.ts index ae2925811..3db78031d 100644 --- a/Clava-JS/src-api/clava/vitishls/VitisHls.ts +++ b/Clava-JS/src-api/clava/vitishls/VitisHls.ts @@ -1,9 +1,9 @@ import Clava from "../Clava.js"; -import ProcessExecutor from "lara-js/api/lara/util/ProcessExecutor.js"; +import ProcessExecutor from "@specs-feup/lara/api/lara/util/ProcessExecutor.js"; import VitisHlsReportParser from "./VitisHlsReportParser.js"; -import Tool from "lara-js/api/lara/tool/Tool.js"; -import ToolUtils from "lara-js/api/lara/tool/ToolUtils.js"; -import Io from "lara-js/api/lara/Io.js"; +import Tool from "@specs-feup/lara/api/lara/tool/Tool.js"; +import ToolUtils from "@specs-feup/lara/api/lara/tool/ToolUtils.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; export default class VitisHls extends Tool { topFunction: string; @@ -80,7 +80,12 @@ export default class VitisHls extends Tool { } private getSynthesisReportPath() { - return this.vitisDir + "/" + this.vitisProjName + "/solution1/syn/report/csynth.xml"; + return ( + this.vitisDir + + "/" + + this.vitisProjName + + "/solution1/syn/report/csynth.xml" + ); } private executeVitis(verbose: boolean) { @@ -149,7 +154,9 @@ exit return (+n).toFixed(decimalPlaces); } - prettyPrintReport(report: ReturnType) { + prettyPrintReport( + report: ReturnType + ) { const period = this.preciseStr(report["clockEstim"], 2); const freq = this.preciseStr(report["fmax"], 2); diff --git a/Clava-JS/src-api/clava/vitishls/VitisHlsReportParser.ts b/Clava-JS/src-api/clava/vitishls/VitisHlsReportParser.ts index 5cf939328..22cc46bed 100644 --- a/Clava-JS/src-api/clava/vitishls/VitisHlsReportParser.ts +++ b/Clava-JS/src-api/clava/vitishls/VitisHlsReportParser.ts @@ -1,4 +1,4 @@ -import Io from "lara-js/api/lara/Io.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; export default class VitisHlsReportParser { private reportPath: string; diff --git a/Clava-JS/src-api/clava/vitishls/VitisHlsUtils.ts b/Clava-JS/src-api/clava/vitishls/VitisHlsUtils.ts index d7cc6e934..866519e2a 100644 --- a/Clava-JS/src-api/clava/vitishls/VitisHlsUtils.ts +++ b/Clava-JS/src-api/clava/vitishls/VitisHlsUtils.ts @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { WrapperStmt } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/Clava-JS/src-api/core.ts b/Clava-JS/src-api/core.ts index 6f59c004b..4ca929e79 100644 --- a/Clava-JS/src-api/core.ts +++ b/Clava-JS/src-api/core.ts @@ -5,7 +5,7 @@ * Remove this file if Clava Classic has died out. */ -const prefix = "clava-js/api/"; +const prefix = "@specs-feup/clava/api/"; const coreImports: string[] = []; const sideEffectsOnlyImports: string[] = ["Joinpoints.js"]; diff --git a/Clava-JS/src-api/jest.config.js b/Clava-JS/src-api/jest.config.js index d062c9217..1a3bc058a 100644 --- a/Clava-JS/src-api/jest.config.js +++ b/Clava-JS/src-api/jest.config.js @@ -2,12 +2,12 @@ import { weaverConfig } from "../code/WeaverConfiguration.js"; const config = { preset: "ts-jest/presets/default-esm", - testEnvironment: "lara-js/jest/jestEnvironment.js", - globalSetup: "lara-js/jest/jestGlobalSetup.js", - globalTeardown: "lara-js/jest/jestGlobalTeardown.js", - setupFiles: ["lara-js/jest/setupFiles/sharedJavaModule.js"], + testEnvironment: "@specs-feup/lara/jest/jestEnvironment.js", + globalSetup: "@specs-feup/lara/jest/jestGlobalSetup.js", + globalTeardown: "@specs-feup/lara/jest/jestGlobalTeardown.js", + setupFiles: ["@specs-feup/lara/jest/setupFiles/sharedJavaModule.js"], moduleNameMapper: { - "clava-js/api/(.+).js": "clava-js/src-api/$1", + "@specs-feup/clava/api/(.+).js": "@specs-feup/clava/src-api/$1", "(.+)\\.js": "$1", }, testEnvironmentOptions: { diff --git a/Clava-JS/src-api/lara/benchmark/ClavaBenchmarkInstance.ts b/Clava-JS/src-api/lara/benchmark/ClavaBenchmarkInstance.ts index 997427fab..ab5ac40a2 100644 --- a/Clava-JS/src-api/lara/benchmark/ClavaBenchmarkInstance.ts +++ b/Clava-JS/src-api/lara/benchmark/ClavaBenchmarkInstance.ts @@ -1,8 +1,8 @@ -import Io from "lara-js/api/lara/Io.js"; -import BenchmarkInstance from "lara-js/api/lara/benchmark/BenchmarkInstance.js"; -import { JavaClasses } from "lara-js/api/lara/util/JavaTypes.js"; -import Query from "lara-js/api/weaver/Query.js"; -import Weaver from "lara-js/api/weaver/Weaver.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import BenchmarkInstance from "@specs-feup/lara/api/lara/benchmark/BenchmarkInstance.js"; +import { JavaClasses } from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; +import Weaver from "@specs-feup/lara/api/weaver/Weaver.js"; import Clava from "../..//clava/Clava.js"; import { Joinpoint, Pragma, Program } from "../../Joinpoints.js"; import CMaker from "../../clava/cmake/CMaker.js"; diff --git a/Clava-JS/src-api/lara/code/Energy.ts b/Clava-JS/src-api/lara/code/Energy.ts index 4bcc0de00..4e74a4cfe 100644 --- a/Clava-JS/src-api/lara/code/Energy.ts +++ b/Clava-JS/src-api/lara/code/Energy.ts @@ -1,10 +1,10 @@ -import EnergyBase from "lara-js/api/lara/code/EnergyBase.js"; +import EnergyBase from "@specs-feup/lara/api/lara/code/EnergyBase.js"; import Clava from "../../clava/Clava.js"; import Logger from "./Logger.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; import { FileJp, Joinpoint } from "../../Joinpoints.js"; export default class Energy extends EnergyBase { @@ -47,7 +47,8 @@ export default class Energy extends EnergyBase { const $file = $start.getAncestor("file") as FileJp | undefined; if ($file === undefined) { console.log( - "Could not find the corresponding file of the given joinpoint: " + $start.joinPointType + "Could not find the corresponding file of the given joinpoint: " + + $start.joinPointType ); return; } diff --git a/Clava-JS/src-api/lara/code/Logger.ts b/Clava-JS/src-api/lara/code/Logger.ts index 275864af0..e7aa0c937 100644 --- a/Clava-JS/src-api/lara/code/Logger.ts +++ b/Clava-JS/src-api/lara/code/Logger.ts @@ -1,6 +1,6 @@ -import LoggerBase from "lara-js/api/lara/code/LoggerBase.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; +import LoggerBase from "@specs-feup/lara/api/lara/code/LoggerBase.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; import Clava from "../../clava/Clava.js"; import { Expression, diff --git a/Clava-JS/src-api/lara/code/Timer.ts b/Clava-JS/src-api/lara/code/Timer.ts index 3c926c998..54f1c2ac3 100644 --- a/Clava-JS/src-api/lara/code/Timer.ts +++ b/Clava-JS/src-api/lara/code/Timer.ts @@ -1,7 +1,7 @@ -import Platforms from "lara-js/api/lara/Platforms.js"; -import TimerBase from "lara-js/api/lara/code/TimerBase.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import { TimerUnit } from "lara-js/api/lara/util/TimeUnits.js"; +import Platforms from "@specs-feup/lara/api/lara/Platforms.js"; +import TimerBase from "@specs-feup/lara/api/lara/code/TimerBase.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import { TimerUnit } from "@specs-feup/lara/api/lara/util/TimeUnits.js"; import { FileJp, Joinpoint, Scope } from "../../Joinpoints.js"; import Clava from "../../clava/Clava.js"; import ClavaJoinPoints from "../../clava/ClavaJoinPoints.js"; @@ -62,13 +62,17 @@ export default class Timer extends TimerBase { const timeIntervalVar = IdGenerator.next("clava_timing_duration_"); // Create literal node with calculation of time interval const $timingResult = ClavaJoinPoints.exprLiteral( - "long long " + this._timer_cpp_calc_interval(startVar, endVar, cppUnit, timeIntervalVar) + "long long " + + this._timer_cpp_calc_interval( + startVar, + endVar, + cppUnit, + timeIntervalVar + ) ); // Build message - logger - .append(prefix) - .appendLong(timeIntervalVar); + logger.append(prefix).appendLong(timeIntervalVar); if (this.printUnit) { logger.append(this.timeUnits.getUnitsString()); } diff --git a/Clava-JS/src-api/lara/metrics/EnergyMetric.ts b/Clava-JS/src-api/lara/metrics/EnergyMetric.ts index 7209e6e5b..b049f001d 100644 --- a/Clava-JS/src-api/lara/metrics/EnergyMetric.ts +++ b/Clava-JS/src-api/lara/metrics/EnergyMetric.ts @@ -1,7 +1,7 @@ -import Strings from "lara-js/api/lara/Strings.js"; -import Metric from "lara-js/api/lara/metrics/Metric.js"; -import MetricResult from "lara-js/api/lara/metrics/MetricResult.js"; -import ProcessExecutor from "lara-js/api/lara/util/ProcessExecutor.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import Metric from "@specs-feup/lara/api/lara/metrics/Metric.js"; +import MetricResult from "@specs-feup/lara/api/lara/metrics/MetricResult.js"; +import ProcessExecutor from "@specs-feup/lara/api/lara/util/ProcessExecutor.js"; import { Joinpoint } from "../../Joinpoints.js"; import Energy from "../code/Energy.js"; diff --git a/Clava-JS/src-api/lara/metrics/ExecutionTimeMetric.ts b/Clava-JS/src-api/lara/metrics/ExecutionTimeMetric.ts index ff992a6ef..1fa7e319d 100644 --- a/Clava-JS/src-api/lara/metrics/ExecutionTimeMetric.ts +++ b/Clava-JS/src-api/lara/metrics/ExecutionTimeMetric.ts @@ -1,8 +1,8 @@ -import Strings from "lara-js/api/lara/Strings.js"; -import Metric from "lara-js/api/lara/metrics/Metric.js"; -import MetricResult from "lara-js/api/lara/metrics/MetricResult.js"; -import ProcessExecutor from "lara-js/api/lara/util/ProcessExecutor.js"; -import { TimerUnit } from "lara-js/api/lara/util/TimeUnits.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import Metric from "@specs-feup/lara/api/lara/metrics/Metric.js"; +import MetricResult from "@specs-feup/lara/api/lara/metrics/MetricResult.js"; +import ProcessExecutor from "@specs-feup/lara/api/lara/util/ProcessExecutor.js"; +import { TimerUnit } from "@specs-feup/lara/api/lara/util/TimeUnits.js"; import { Joinpoint } from "../../Joinpoints.js"; import Timer from "../code/Timer.js"; diff --git a/Clava-JS/src-api/weaver/WeaverLauncher.ts b/Clava-JS/src-api/weaver/WeaverLauncher.ts index e7b10a15d..1faee2aba 100644 --- a/Clava-JS/src-api/weaver/WeaverLauncher.ts +++ b/Clava-JS/src-api/weaver/WeaverLauncher.ts @@ -1,4 +1,4 @@ -import WeaverLauncherBase from "lara-js/api/weaver/WeaverLauncherBase.js"; +import WeaverLauncherBase from "@specs-feup/lara/api/weaver/WeaverLauncherBase.js"; import Clava from "../clava/Clava.js"; export default class WeaverLauncher extends WeaverLauncherBase { diff --git a/Clava-JS/src-code/ClangPlugin/ClangPlugin.test.ts b/Clava-JS/src-code/ClangPlugin/ClangPlugin.test.ts index 764770dc4..48ec45472 100644 --- a/Clava-JS/src-code/ClangPlugin/ClangPlugin.test.ts +++ b/Clava-JS/src-code/ClangPlugin/ClangPlugin.test.ts @@ -23,6 +23,7 @@ describe("ClangPlugin", () => { }); }); + /* describe("getClangVersionNumberFromExecutable", () => { it("should return the clang version number when given a valid clang executable", async () => { const clangExecutable = "clang++-14"; @@ -88,4 +89,5 @@ describe("ClangPlugin", () => { jest.restoreAllMocks(); }); }); + */ }); diff --git a/Clava-JS/src-code/Sandbox.ts b/Clava-JS/src-code/Sandbox.ts index 37d86caf5..50b423cf0 100644 --- a/Clava-JS/src-code/Sandbox.ts +++ b/Clava-JS/src-code/Sandbox.ts @@ -1,5 +1,5 @@ import { ChildProcess, spawn, spawnSync } from "child_process"; -import { addActiveChildProcess } from "lara-js/code/ChildProcessHandling.js"; +import { addActiveChildProcess } from "@specs-feup/lara/code/ChildProcessHandling.js"; export default class Sandbox { /** diff --git a/Clava-JS/src-code/WeaverConfiguration.ts b/Clava-JS/src-code/WeaverConfiguration.ts index ee9a85a50..e6729c428 100644 --- a/Clava-JS/src-code/WeaverConfiguration.ts +++ b/Clava-JS/src-code/WeaverConfiguration.ts @@ -1,15 +1,15 @@ -import WeaverConfiguration from "lara-js/code/WeaverConfiguration.js"; +import WeaverConfiguration from "@specs-feup/lara/code/WeaverConfiguration.js"; import path from "path"; import { fileURLToPath } from "url"; export const weaverConfig: WeaverConfiguration = { weaverName: "clava", weaverPrettyName: "Clava", - weaverFileName: "lara-js/code/Weaver.js", + weaverFileName: "@specs-feup/lara/code/Weaver.js", jarPath: path.join( path.dirname(path.dirname(fileURLToPath(import.meta.url))), "./java-binaries/" ), javaWeaverQualifiedName: "pt.up.fe.specs.clava.weaver.CxxWeaver", - importForSideEffects: ["clava-js/api/Joinpoints.js"], + importForSideEffects: ["@specs-feup/clava/api/Joinpoints.js"], }; diff --git a/Clava-JS/src-code/index.ts b/Clava-JS/src-code/index.ts index 4297292a1..c9782c286 100644 --- a/Clava-JS/src-code/index.ts +++ b/Clava-JS/src-code/index.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import WeaverLauncher from "lara-js/code/WeaverLauncher.js"; +import WeaverLauncher from "@specs-feup/lara/code/WeaverLauncher.js"; import { weaverConfig } from "./WeaverConfiguration.js"; const weaverLauncher = new WeaverLauncher(weaverConfig); diff --git a/Clava-JS/typedoc.config.js b/Clava-JS/typedoc.config.js index 4f737e868..b000de544 100644 --- a/Clava-JS/typedoc.config.js +++ b/Clava-JS/typedoc.config.js @@ -1,7 +1,9 @@ import { fileURLToPath } from "url"; export default { - extends: [ fileURLToPath(import.meta.resolve("lara-js/typedoc.base.json")) ], + extends: [ + fileURLToPath(import.meta.resolve("@specs-feup/lara/typedoc.base.json")), + ], entryPoints: ["src-api/"], tsconfig: "src-api/tsconfig.json", -} +}; diff --git a/ClavaLaraApi/src-lara/clava/Joinpoints.js b/ClavaLaraApi/src-lara/clava/Joinpoints.js index e329dc0b5..ff692d367 100644 --- a/ClavaLaraApi/src-lara/clava/Joinpoints.js +++ b/ClavaLaraApi/src-lara/clava/Joinpoints.js @@ -8,10 +8,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-duplicate-type-constituents */ -import { LaraJoinPoint, registerJoinpointMapper, wrapJoinPoint, unwrapJoinPoint, } from "lara-js/api/LaraJoinPoint.js"; +import { LaraJoinPoint, registerJoinpointMapper, wrapJoinPoint, unwrapJoinPoint, } from "@specs-feup/lara/api/LaraJoinPoint.js"; export class Joinpoint extends LaraJoinPoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -325,7 +325,7 @@ export class Joinpoint extends LaraJoinPoint { */ setData(source) { return wrapJoinPoint(this._javaObject.setData(JSON.stringify(source))); } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. */ setFirstChild(node) { return wrapJoinPoint(this._javaObject.setFirstChild(unwrapJoinPoint(node))); } /** @@ -333,7 +333,7 @@ export class Joinpoint extends LaraJoinPoint { */ setInlineComments(p1) { return wrapJoinPoint(this._javaObject.setInlineComments(unwrapJoinPoint(p1))); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. */ setLastChild(node) { return wrapJoinPoint(this._javaObject.setLastChild(unwrapJoinPoint(node))); } /** @@ -355,7 +355,7 @@ export class Joinpoint extends LaraJoinPoint { } export class Attribute extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -367,7 +367,7 @@ export class Attribute extends Joinpoint { */ export class ClavaException extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -378,7 +378,7 @@ export class ClavaException extends Joinpoint { } export class Comment extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -392,7 +392,7 @@ export class Comment extends Joinpoint { */ export class Decl extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -407,7 +407,7 @@ export class Decl extends Joinpoint { */ export class Empty extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -415,7 +415,7 @@ export class Empty extends Joinpoint { } export class Expression extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -440,7 +440,7 @@ export class Expression extends Joinpoint { */ export class FileJp extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -564,7 +564,7 @@ export class FileJp extends Joinpoint { } export class ImplicitValue extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -575,7 +575,7 @@ export class ImplicitValue extends Expression { */ export class Include extends Decl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -595,7 +595,7 @@ export class Include extends Decl { } export class InitList extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -607,7 +607,7 @@ export class InitList extends Expression { } export class Literal extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -615,7 +615,7 @@ export class Literal extends Expression { } export class MemberAccess extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -642,7 +642,7 @@ export class MemberAccess extends Expression { */ export class NamedDecl extends Decl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -669,7 +669,7 @@ export class NamedDecl extends Decl { } export class NewExpr extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -677,7 +677,7 @@ export class NewExpr extends Expression { } export class Op extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -691,7 +691,7 @@ export class Op extends Expression { } export class ParenExpr extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -706,7 +706,7 @@ export class ParenExpr extends Expression { */ export class Pragma extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -743,7 +743,7 @@ export class Pragma extends Joinpoint { */ export class Program extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -848,7 +848,7 @@ export class Program extends Joinpoint { */ export class RecordJp extends NamedDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -871,7 +871,7 @@ export class RecordJp extends NamedDecl { } export class Statement extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -884,7 +884,7 @@ export class Statement extends Joinpoint { */ export class Struct extends RecordJp { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -892,7 +892,7 @@ export class Struct extends RecordJp { } export class Switch extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -919,7 +919,7 @@ export class Switch extends Statement { */ export class Tag extends Pragma { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "id", @@ -931,7 +931,7 @@ export class Tag extends Pragma { } export class TernaryOp extends Op { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -942,7 +942,7 @@ export class TernaryOp extends Op { } export class This extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -950,7 +950,7 @@ export class This extends Expression { } export class Type extends Joinpoint { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1030,7 +1030,7 @@ export class Type extends Joinpoint { */ export class TypedefNameDecl extends NamedDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1041,7 +1041,7 @@ export class TypedefNameDecl extends NamedDecl { */ export class TypedefType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1057,7 +1057,7 @@ export class TypedefType extends Type { } export class UnaryExprOrType extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1072,7 +1072,7 @@ export class UnaryExprOrType extends Expression { } export class UnaryOp extends Op { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1082,7 +1082,7 @@ export class UnaryOp extends Op { } export class UndefinedType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1093,7 +1093,7 @@ export class UndefinedType extends Type { */ export class Varref extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1122,7 +1122,7 @@ export class Varref extends Expression { } export class WrapperStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1132,7 +1132,7 @@ export class WrapperStmt extends Statement { } export class AccessSpecifier extends Decl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "kind", @@ -1144,7 +1144,7 @@ export class AccessSpecifier extends Decl { } export class AdjustedType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1156,7 +1156,7 @@ export class AdjustedType extends Type { } export class ArrayAccess extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1184,7 +1184,7 @@ export class ArrayAccess extends Expression { } export class ArrayType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1198,7 +1198,7 @@ export class ArrayType extends Type { } export class BinaryOp extends Op { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1213,7 +1213,7 @@ export class BinaryOp extends Op { } export class BoolLiteral extends Literal { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1222,7 +1222,7 @@ export class BoolLiteral extends Literal { } export class Break extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1234,7 +1234,7 @@ export class Break extends Statement { } export class BuiltinType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1263,7 +1263,7 @@ export class BuiltinType extends Type { } export class Call extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1333,7 +1333,7 @@ export class Call extends Expression { } export class Case extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1365,7 +1365,7 @@ export class Case extends Statement { } export class Cast extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1380,7 +1380,7 @@ export class Cast extends Expression { } export class CilkSpawn extends Call { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1388,7 +1388,7 @@ export class CilkSpawn extends Call { } export class CilkSync extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1399,7 +1399,7 @@ export class CilkSync extends Statement { */ export class Class extends RecordJp { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1451,7 +1451,7 @@ export class Class extends RecordJp { } export class Continue extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1459,7 +1459,7 @@ export class Continue extends Statement { } export class CudaKernelCall extends Call { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1471,7 +1471,7 @@ export class CudaKernelCall extends Call { } export class DeclStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1486,7 +1486,7 @@ export class DeclStmt extends Statement { */ export class Declarator extends NamedDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1494,7 +1494,7 @@ export class Declarator extends NamedDecl { } export class DeleteExpr extends Expression { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1505,7 +1505,7 @@ export class DeleteExpr extends Expression { */ export class ElaboratedType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1525,7 +1525,7 @@ export class ElaboratedType extends Type { } export class EmptyStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1536,7 +1536,7 @@ export class EmptyStmt extends Statement { */ export class EnumDecl extends NamedDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1545,7 +1545,7 @@ export class EnumDecl extends NamedDecl { } export class EnumeratorDecl extends NamedDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1553,7 +1553,7 @@ export class EnumeratorDecl extends NamedDecl { } export class ExprStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1568,7 +1568,7 @@ export class ExprStmt extends Statement { */ export class Field extends Declarator { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1576,7 +1576,7 @@ export class Field extends Declarator { } export class FloatLiteral extends Literal { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1588,7 +1588,7 @@ export class FloatLiteral extends Literal { */ export class FunctionJp extends Declarator { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1707,7 +1707,7 @@ export class FunctionJp extends Declarator { } export class FunctionType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1726,7 +1726,7 @@ export class FunctionType extends Type { } export class GotoStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1740,7 +1740,7 @@ export class GotoStmt extends Statement { } export class If extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1767,7 +1767,7 @@ export class If extends Statement { } export class IntLiteral extends Literal { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1776,7 +1776,7 @@ export class IntLiteral extends Literal { } export class LabelDecl extends NamedDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1784,7 +1784,7 @@ export class LabelDecl extends NamedDecl { } export class LabelStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -1798,7 +1798,7 @@ export class LabelStmt extends Statement { } export class Loop extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "kind", @@ -1924,7 +1924,7 @@ export class Loop extends Statement { */ export class Marker extends Pragma { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "id", @@ -1937,7 +1937,7 @@ export class Marker extends Pragma { } export class MemberCall extends Call { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1950,7 +1950,7 @@ export class MemberCall extends Call { */ export class Method extends FunctionJp { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -1966,7 +1966,7 @@ export class Method extends FunctionJp { */ export class Omp extends Pragma { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "kind", @@ -2170,7 +2170,7 @@ export class Omp extends Pragma { } export class ParenType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2184,7 +2184,7 @@ export class ParenType extends Type { } export class PointerType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2202,7 +2202,7 @@ export class PointerType extends Type { } export class QualType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2212,7 +2212,7 @@ export class QualType extends Type { } export class ReturnStmt extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2224,7 +2224,7 @@ export class ReturnStmt extends Statement { */ export class Scope extends Statement { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2284,7 +2284,7 @@ export class Scope extends Statement { } export class TagType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2297,7 +2297,7 @@ export class TagType extends Type { } export class TemplateSpecializationType extends Type { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2312,7 +2312,7 @@ export class TemplateSpecializationType extends Type { */ export class TypedefDecl extends TypedefNameDecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -2323,7 +2323,7 @@ export class TypedefDecl extends TypedefNameDecl { */ export class Vardecl extends Declarator { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", @@ -2383,7 +2383,7 @@ export class Vardecl extends Declarator { } export class VariableArrayType extends ArrayType { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2397,7 +2397,7 @@ export class VariableArrayType extends ArrayType { } export class Body extends Scope { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2405,7 +2405,7 @@ export class Body extends Scope { } export class CilkFor extends Loop { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "kind", @@ -2413,7 +2413,7 @@ export class CilkFor extends Loop { } export class EnumType extends TagType { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: null, @@ -2422,7 +2422,7 @@ export class EnumType extends TagType { } export class Param extends Vardecl { /** - * @hidden + * @internal */ static _defaultAttributeInfo = { name: "name", diff --git a/ClavaLaraApi/src-lara/clava/clava/Clava.js b/ClavaLaraApi/src-lara/clava/clava/Clava.js index 09057805a..f53de7390 100644 --- a/ClavaLaraApi/src-lara/clava/clava/Clava.js +++ b/ClavaLaraApi/src-lara/clava/clava/Clava.js @@ -1,9 +1,9 @@ -import { wrapJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import Io from "lara-js/api/lara/Io.js"; -import JavaInterop from "lara-js/api/lara/JavaInterop.js"; -import Query from "lara-js/api/weaver/Query.js"; -import Weaver from "lara-js/api/weaver/Weaver.js"; -import WeaverOptions from "lara-js/api/weaver/WeaverOptions.js"; +import { wrapJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import JavaInterop from "@specs-feup/lara/api/lara/JavaInterop.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; +import Weaver from "@specs-feup/lara/api/weaver/Weaver.js"; +import WeaverOptions from "@specs-feup/lara/api/weaver/WeaverOptions.js"; import ClavaJavaTypes from "./ClavaJavaTypes.js"; import ClavaDataStore from "./util/ClavaDataStore.js"; export default class Clava { diff --git a/ClavaLaraApi/src-lara/clava/clava/ClavaCode.js b/ClavaLaraApi/src-lara/clava/clava/ClavaCode.js index 1cad9d8e3..6132ca1f0 100644 --- a/ClavaLaraApi/src-lara/clava/clava/ClavaCode.js +++ b/ClavaLaraApi/src-lara/clava/clava/ClavaCode.js @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FileJp, FunctionJp, If, Loop, StorageClass, Vardecl, } from "../Joinpoints.js"; import Clava from "./Clava.js"; /** diff --git a/ClavaLaraApi/src-lara/clava/clava/ClavaJavaTypes.js b/ClavaLaraApi/src-lara/clava/clava/ClavaJavaTypes.js index c93266ad0..884156d2f 100644 --- a/ClavaLaraApi/src-lara/clava/clava/ClavaJavaTypes.js +++ b/ClavaLaraApi/src-lara/clava/clava/ClavaJavaTypes.js @@ -1,4 +1,4 @@ -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; /** * Static variables with class names of Java classes used in the Clava API. * diff --git a/ClavaLaraApi/src-lara/clava/clava/ClavaJoinPoints.js b/ClavaLaraApi/src-lara/clava/clava/ClavaJoinPoints.js index 44e542cdd..630e5dada 100644 --- a/ClavaLaraApi/src-lara/clava/clava/ClavaJoinPoints.js +++ b/ClavaLaraApi/src-lara/clava/clava/ClavaJoinPoints.js @@ -1,5 +1,5 @@ -import { unwrapJoinPoint, wrapJoinPoint } from "lara-js/api/LaraJoinPoint.js"; -import { arrayFromArgs, flattenArgsArray, } from "lara-js/api/lara/core/LaraCore.js"; +import { unwrapJoinPoint, wrapJoinPoint, } from "@specs-feup/lara/api/LaraJoinPoint.js"; +import { arrayFromArgs, flattenArgsArray, } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import * as Joinpoints from "../Joinpoints.js"; import Clava from "./Clava.js"; import ClavaJavaTypes from "./ClavaJavaTypes.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/Format.js b/ClavaLaraApi/src-lara/clava/clava/Format.js index 81cc4d17e..418948760 100644 --- a/ClavaLaraApi/src-lara/clava/clava/Format.js +++ b/ClavaLaraApi/src-lara/clava/clava/Format.js @@ -1,10 +1,16 @@ -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; export default class Format { static addPrefix(str, prefix) { - return str.split("\n").map(line => prefix + line).join("\n"); + return str + .split("\n") + .map((line) => prefix + line) + .join("\n"); } static addSuffix(str, suffix) { - return str.split("\n").map(line => line + suffix).join("\n"); + return str + .split("\n") + .map((line) => line + suffix) + .join("\n"); } static addPrefixAndSuffix(str, prefix, suffix) { return Format.addSuffix(Format.addPrefix(str, prefix), suffix); diff --git a/ClavaLaraApi/src-lara/clava/clava/MathExtra.js b/ClavaLaraApi/src-lara/clava/clava/MathExtra.js index fc80a02c5..0e1d2cf86 100644 --- a/ClavaLaraApi/src-lara/clava/clava/MathExtra.js +++ b/ClavaLaraApi/src-lara/clava/clava/MathExtra.js @@ -1,4 +1,4 @@ -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; import { Expression } from "../Joinpoints.js"; import ClavaJavaTypes from "./ClavaJavaTypes.js"; export default class MathExtra { diff --git a/ClavaLaraApi/src-lara/clava/clava/analysis/CheckBasedAnalyser.js b/ClavaLaraApi/src-lara/clava/clava/analysis/CheckBasedAnalyser.js index 813457486..34f28c86c 100644 --- a/ClavaLaraApi/src-lara/clava/clava/analysis/CheckBasedAnalyser.js +++ b/ClavaLaraApi/src-lara/clava/clava/analysis/CheckBasedAnalyser.js @@ -1,6 +1,6 @@ import Analyser from "./Analyser.js"; import ResultFormatManager from "./ResultFormatManager.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; /** * Analyser that scan code to detect unsafe functions */ diff --git a/ClavaLaraApi/src-lara/clava/clava/analysis/MessageGenerator.js b/ClavaLaraApi/src-lara/clava/clava/analysis/MessageGenerator.js index 82f848bd5..a9a070713 100644 --- a/ClavaLaraApi/src-lara/clava/clava/analysis/MessageGenerator.js +++ b/ClavaLaraApi/src-lara/clava/clava/analysis/MessageGenerator.js @@ -1,4 +1,4 @@ -import Io from "lara-js/api/lara/Io.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; import Clava from "../Clava.js"; // Class sorting resultLists and generating an analysis report export default class MessageGenerator { diff --git a/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/BoundsAnalyser.js b/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/BoundsAnalyser.js index d95e6968e..fdce70996 100644 --- a/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/BoundsAnalyser.js +++ b/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/BoundsAnalyser.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { ArrayAccess, ArrayType, FunctionJp, Vardecl, } from "../../../Joinpoints.js"; import Analyser from "../Analyser.js"; import ResultFormatManager from "../ResultFormatManager.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/DoubleFreeAnalyser.js b/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/DoubleFreeAnalyser.js index 333b4fec3..66aeb378f 100644 --- a/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/DoubleFreeAnalyser.js +++ b/ClavaLaraApi/src-lara/clava/clava/analysis/analysers/DoubleFreeAnalyser.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Call, FunctionJp, Vardecl, } from "../../../Joinpoints.js"; import Analyser from "../Analyser.js"; import ResultFormatManager from "../ResultFormatManager.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js b/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js index 03017fa7a..bddc3efee 100644 --- a/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js +++ b/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js @@ -1,11 +1,11 @@ -import Io from "lara-js/api/lara/Io.js"; -import Platforms from "lara-js/api/lara/Platforms.js"; -import { arrayFromArgs, debug, debugObject, } from "lara-js/api/lara/core/LaraCore.js"; -import ProcessExecutor from "lara-js/api/lara/util/ProcessExecutor.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Platforms from "@specs-feup/lara/api/lara/Platforms.js"; +import { arrayFromArgs, debug, debugObject, } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import ProcessExecutor from "@specs-feup/lara/api/lara/util/ProcessExecutor.js"; import Clava from "../Clava.js"; import CMakerSources from "./CMakerSources.js"; import CMakerUtils from "./CMakerUtils.js"; -import BenchmarkCompilationEngine from "lara-js/api/lara/benchmark/BenchmarkCompilationEngine.js"; +import BenchmarkCompilationEngine from "@specs-feup/lara/api/lara/benchmark/BenchmarkCompilationEngine.js"; /** * Builds CMake configurations. * diff --git a/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerSources.js b/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerSources.js index e9770e995..5f0357644 100644 --- a/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerSources.js +++ b/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerSources.js @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import Clava from "../Clava.js"; import CMakerUtils from "./CMakerUtils.js"; /** @@ -142,6 +142,5 @@ export default class CMakerSources { } return prefix + values.join("\n" + space) + "\n)"; } - ; } //# sourceMappingURL=CMakerSources.js.map \ No newline at end of file diff --git a/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerUtils.js b/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerUtils.js index 43f64b646..f8e19fcc2 100644 --- a/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerUtils.js +++ b/ClavaLaraApi/src-lara/clava/clava/cmake/CMakerUtils.js @@ -1,4 +1,4 @@ -import ToolUtils from "lara-js/api/lara/tool/ToolUtils.js"; +import ToolUtils from "@specs-feup/lara/api/lara/tool/ToolUtils.js"; import GenericCMakeCompiler from "./compilers/GenericCMakeCompiler.js"; export default class CMakerUtils extends ToolUtils { static compilerTable = { diff --git a/ClavaLaraApi/src-lara/clava/clava/code/Inliner.js b/ClavaLaraApi/src-lara/clava/clava/code/Inliner.js index 98ed54f4c..f72b94787 100644 --- a/ClavaLaraApi/src-lara/clava/clava/code/Inliner.js +++ b/ClavaLaraApi/src-lara/clava/clava/code/Inliner.js @@ -1,5 +1,5 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Call, Expression, GotoStmt, Joinpoint, LabelDecl, LabelStmt, ParenExpr, ParenType, PointerType, StorageClass, Vardecl, VariableArrayType, Varref, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; export default class Inliner { diff --git a/ClavaLaraApi/src-lara/clava/clava/code/Outliner.js b/ClavaLaraApi/src-lara/clava/clava/code/Outliner.js index 0fd61d64f..99d54a5e8 100644 --- a/ClavaLaraApi/src-lara/clava/clava/code/Outliner.js +++ b/ClavaLaraApi/src-lara/clava/clava/code/Outliner.js @@ -1,5 +1,5 @@ -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import Query from "lara-js/api/weaver/Query.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { AdjustedType, ArrayType, BuiltinType, Decl, DeclStmt, FileJp, FunctionJp, Param, PointerType, ReturnStmt, Statement, Vardecl, Varref, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; export default class Outliner { diff --git a/ClavaLaraApi/src-lara/clava/clava/code/StatementDecomposer.js b/ClavaLaraApi/src-lara/clava/clava/code/StatementDecomposer.js index 0238ec9a3..d36581100 100644 --- a/ClavaLaraApi/src-lara/clava/clava/code/StatementDecomposer.js +++ b/ClavaLaraApi/src-lara/clava/clava/code/StatementDecomposer.js @@ -1,4 +1,4 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import { BinaryOp, Call, Case, DeclStmt, EmptyStmt, ExprStmt, LabelStmt, MemberCall, ReturnStmt, Scope, Statement, TernaryOp, UnaryOp, Vardecl, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; import DecomposeResult from "./DecomposeResult.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/gprofer/Gprofer.js b/ClavaLaraApi/src-lara/clava/clava/gprofer/Gprofer.js index 76824e4ad..4b7350af5 100644 --- a/ClavaLaraApi/src-lara/clava/clava/gprofer/Gprofer.js +++ b/ClavaLaraApi/src-lara/clava/clava/gprofer/Gprofer.js @@ -1,11 +1,11 @@ -import Io from "lara-js/api/lara/Io.js"; -import Strings from "lara-js/api/lara/Strings.js"; -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FunctionJp } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import CMaker from "../cmake/CMaker.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; function GproferGetCxxFunction(signature) { return Query.search(FunctionJp, { signature: signature, diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/ControlFlowGraph.js b/ClavaLaraApi/src-lara/clava/clava/graphs/ControlFlowGraph.js index 1b26f79a4..95e66e0e9 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/ControlFlowGraph.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/ControlFlowGraph.js @@ -1,4 +1,4 @@ -import Graph from "lara-js/api/lara/graphs/Graph.js"; +import Graph from "@specs-feup/lara/api/lara/graphs/Graph.js"; import CfgBuilder from "./cfg/CfgBuilder.js"; export default class ControlFlowGraph extends Graph { /** diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/StaticCallGraph.js b/ClavaLaraApi/src-lara/clava/clava/graphs/StaticCallGraph.js index 3a9251b4d..d4a168c20 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/StaticCallGraph.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/StaticCallGraph.js @@ -1,6 +1,6 @@ -import DotFormatter from "lara-js/api/lara/graphs/DotFormatter.js"; -import Graph from "lara-js/api/lara/graphs/Graph.js"; -import Graphs from "lara-js/api/lara/graphs/Graphs.js"; +import DotFormatter from "@specs-feup/lara/api/lara/graphs/DotFormatter.js"; +import Graph from "@specs-feup/lara/api/lara/graphs/Graph.js"; +import Graphs from "@specs-feup/lara/api/lara/graphs/Graphs.js"; import StaticCallGraphBuilder from "./scg/StaticCallGraphBuilder.js"; export default class StaticCallGraph extends Graph { static dotFormatterInstance = undefined; diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgBuilder.js b/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgBuilder.js index f8ed05f20..ebb89ebf6 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgBuilder.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgBuilder.js @@ -1,6 +1,6 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Graphs from "lara-js/api/lara/graphs/Graphs.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Graphs from "@specs-feup/lara/api/lara/graphs/Graphs.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FunctionJp, LabelStmt, Loop, Scope, Statement, } from "../../../Joinpoints.js"; import ClavaJoinPoints from "../../ClavaJoinPoints.js"; import CfgEdge from "./CfgEdge.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgEdge.js b/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgEdge.js index 785300004..06bd532db 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgEdge.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgEdge.js @@ -1,4 +1,4 @@ -import EdgeData from "lara-js/api/lara/graphs/EdgeData.js"; +import EdgeData from "@specs-feup/lara/api/lara/graphs/EdgeData.js"; import CfgEdgeType from "./CfgEdgeType.js"; /** * An edge of the CFG diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgNodeData.js b/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgNodeData.js index eb27407af..ca9632c39 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgNodeData.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/cfg/CfgNodeData.js @@ -1,4 +1,4 @@ -import NodeData from "lara-js/api/lara/graphs/NodeData.js"; +import NodeData from "@specs-feup/lara/api/lara/graphs/NodeData.js"; /** * The data of a CFG node. */ diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgEdgeData.js b/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgEdgeData.js index 33b3652bf..038001243 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgEdgeData.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgEdgeData.js @@ -1,4 +1,4 @@ -import EdgeData from "lara-js/api/lara/graphs/EdgeData.js"; +import EdgeData from "@specs-feup/lara/api/lara/graphs/EdgeData.js"; export default class ScgEdgeData extends EdgeData { /** * The calls that contributed to this edge diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgNodeData.js b/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgNodeData.js index ad679f648..1fa1f996c 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgNodeData.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/scg/ScgNodeData.js @@ -1,5 +1,5 @@ -import NodeData from "lara-js/api/lara/graphs/NodeData.js"; -import Query from "lara-js/api/weaver/Query.js"; +import NodeData from "@specs-feup/lara/api/lara/graphs/NodeData.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call } from "../../../Joinpoints.js"; export default class ScgNodeData extends NodeData { /** diff --git a/ClavaLaraApi/src-lara/clava/clava/graphs/scg/StaticCallGraphBuilder.js b/ClavaLaraApi/src-lara/clava/clava/graphs/scg/StaticCallGraphBuilder.js index 5e2a34bbb..8e5cadea0 100644 --- a/ClavaLaraApi/src-lara/clava/clava/graphs/scg/StaticCallGraphBuilder.js +++ b/ClavaLaraApi/src-lara/clava/clava/graphs/scg/StaticCallGraphBuilder.js @@ -1,5 +1,5 @@ -import Graphs from "lara-js/api/lara/graphs/Graphs.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Graphs from "@specs-feup/lara/api/lara/graphs/Graphs.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FunctionJp } from "../../../Joinpoints.js"; import ScgEdgeData from "./ScgEdgeData.js"; import ScgNodeData from "./ScgNodeData.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/hls/HLSAnalysis.js b/ClavaLaraApi/src-lara/clava/clava/hls/HLSAnalysis.js index 4b992a5d4..157ec4ba5 100644 --- a/ClavaLaraApi/src-lara/clava/clava/hls/HLSAnalysis.js +++ b/ClavaLaraApi/src-lara/clava/clava/hls/HLSAnalysis.js @@ -1,4 +1,4 @@ -import { unwrapJoinPoint } from "lara-js/api/LaraJoinPoint.js"; +import { unwrapJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js"; import ClavaJavaTypes from "../ClavaJavaTypes.js"; export default class HLSAnalysis { /** diff --git a/ClavaLaraApi/src-lara/clava/clava/hls/MathAnalysis.js b/ClavaLaraApi/src-lara/clava/clava/hls/MathAnalysis.js index 0f5a58f89..8b144068f 100644 --- a/ClavaLaraApi/src-lara/clava/clava/hls/MathAnalysis.js +++ b/ClavaLaraApi/src-lara/clava/clava/hls/MathAnalysis.js @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; import MathHInfo from "./MathHInfo.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/hls/MathHInfo.js b/ClavaLaraApi/src-lara/clava/clava/hls/MathHInfo.js index e81585d79..8cdf4795a 100644 --- a/ClavaLaraApi/src-lara/clava/clava/hls/MathHInfo.js +++ b/ClavaLaraApi/src-lara/clava/clava/hls/MathHInfo.js @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/hls/TraceInstrumentation.js b/ClavaLaraApi/src-lara/clava/clava/hls/TraceInstrumentation.js index 309c4b545..ba9d86f66 100644 --- a/ClavaLaraApi/src-lara/clava/clava/hls/TraceInstrumentation.js +++ b/ClavaLaraApi/src-lara/clava/clava/hls/TraceInstrumentation.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { ArrayAccess, BinaryOp, Expression, FunctionJp, Loop, Param, Scope, Statement, UnaryOp, Vardecl, Varref, } from "../../Joinpoints.js"; import Logger from "../../lara/code/Logger.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/liveness/LivenessUtils.js b/ClavaLaraApi/src-lara/clava/clava/liveness/LivenessUtils.js index 354eb4ac9..597e64d49 100644 --- a/ClavaLaraApi/src-lara/clava/clava/liveness/LivenessUtils.js +++ b/ClavaLaraApi/src-lara/clava/clava/liveness/LivenessUtils.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, Vardecl, Varref, } from "../../Joinpoints.js"; export default class LivenessUtils { /** diff --git a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiAnalysis.js b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiAnalysis.js index 8da32ce2e..0df749c01 100644 --- a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiAnalysis.js +++ b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiAnalysis.js @@ -1,6 +1,6 @@ -import { JSONtoFile } from "lara-js/api/core/output.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { JSONtoFile } from "@specs-feup/lara/api/core/output.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call } from "../../Joinpoints.js"; import MemoiTarget from "./MemoiTarget.js"; import MemoiUtils from "./MemoiUtils.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiGen.js b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiGen.js index d5a8ebed9..3ade6cfa5 100644 --- a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiGen.js +++ b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiGen.js @@ -1,8 +1,8 @@ -import Io from "lara-js/api/lara/Io.js"; -import { arrayFromArgs } from "lara-js/api/lara/core/LaraCore.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import { TimerUnit } from "lara-js/api/lara/util/TimeUnits.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { arrayFromArgs } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import { TimerUnit } from "@specs-feup/lara/api/lara/util/TimeUnits.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp } from "../../Joinpoints.js"; import Timer from "../../lara/code/Timer.js"; import ClavaJavaTypes from "../ClavaJavaTypes.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiProf.js b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiProf.js index 2a7a79126..a634bd0d0 100644 --- a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiProf.js +++ b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiProf.js @@ -1,6 +1,6 @@ -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; -import Query from "lara-js/api/weaver/Query.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp, Scope } from "../../Joinpoints.js"; import Clava from "../Clava.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiTarget.js b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiTarget.js index 559060e85..754990451 100644 --- a/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiTarget.js +++ b/ClavaLaraApi/src-lara/clava/clava/memoi/MemoiTarget.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FunctionJp } from "../../Joinpoints.js"; import MemoiUtils from "./MemoiUtils.js"; export default class MemoiTarget { diff --git a/ClavaLaraApi/src-lara/clava/clava/memoi/_MemoiGenHelper.js b/ClavaLaraApi/src-lara/clava/clava/memoi/_MemoiGenHelper.js index c55715489..1d05ca8e9 100644 --- a/ClavaLaraApi/src-lara/clava/clava/memoi/_MemoiGenHelper.js +++ b/ClavaLaraApi/src-lara/clava/clava/memoi/_MemoiGenHelper.js @@ -1,6 +1,6 @@ -import { debug } from "lara-js/api/lara/core/LaraCore.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import Query from "lara-js/api/weaver/Query.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Call, FileJp, FunctionJp, Statement } from "../../Joinpoints.js"; import ClavaJavaTypes from "../ClavaJavaTypes.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacer.js b/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacer.js index f1fc17d74..73189d865 100644 --- a/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacer.js +++ b/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacer.js @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import Strings from "lara-js/api/lara/Strings.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; import { BuiltinType, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; export default class KernelReplacer { diff --git a/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacerAuto.js b/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacerAuto.js index c5468b0c7..df426374d 100644 --- a/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacerAuto.js +++ b/ClavaLaraApi/src-lara/clava/clava/opencl/KernelReplacerAuto.js @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import Strings from "lara-js/api/lara/Strings.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { Pragma } from "../../Joinpoints.js"; import KernelReplacer from "./KernelReplacer.js"; // This aspect can be included in a library, imported and diff --git a/ClavaLaraApi/src-lara/clava/clava/opencl/OpenCLCall.js b/ClavaLaraApi/src-lara/clava/clava/opencl/OpenCLCall.js index 86154193b..1128bbd16 100644 --- a/ClavaLaraApi/src-lara/clava/clava/opencl/OpenCLCall.js +++ b/ClavaLaraApi/src-lara/clava/clava/opencl/OpenCLCall.js @@ -1,6 +1,6 @@ -import Io from "lara-js/api/lara/Io.js"; -import Platforms from "lara-js/api/lara/Platforms.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Platforms from "@specs-feup/lara/api/lara/Platforms.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; import OpenCLCallVariables from "./OpenCLCallVariables.js"; export default class OpenCLCall { $kernel = undefined; diff --git a/ClavaLaraApi/src-lara/clava/clava/opt/Inlining.js b/ClavaLaraApi/src-lara/clava/clava/opt/Inlining.js index 960767e15..e96e8eee3 100644 --- a/ClavaLaraApi/src-lara/clava/clava/opt/Inlining.js +++ b/ClavaLaraApi/src-lara/clava/clava/opt/Inlining.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { FunctionJp } from "../../Joinpoints.js"; import Inliner from "../code/Inliner.js"; import NormalizeToSubset from "./NormalizeToSubset.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/opt/NormalizeToSubset.js b/ClavaLaraApi/src-lara/clava/clava/opt/NormalizeToSubset.js index 514165d96..9782683ee 100644 --- a/ClavaLaraApi/src-lara/clava/clava/opt/NormalizeToSubset.js +++ b/ClavaLaraApi/src-lara/clava/clava/opt/NormalizeToSubset.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp } from "../../Joinpoints.js"; import SimplifyAssignment from "../code/SimplifyAssignment.js"; import StatementDecomposer from "../code/StatementDecomposer.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/parser/BatchParser.js b/ClavaLaraApi/src-lara/clava/clava/parser/BatchParser.js index 1d38e6952..f57d7caa2 100644 --- a/ClavaLaraApi/src-lara/clava/clava/parser/BatchParser.js +++ b/ClavaLaraApi/src-lara/clava/clava/parser/BatchParser.js @@ -1,10 +1,10 @@ -import Io from "lara-js/api/lara/Io.js"; -import Check from "lara-js/api/lara/Check.js"; -import System from "lara-js/api/lara/System.js"; -import Strings from "lara-js/api/lara/Strings.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import Check from "@specs-feup/lara/api/lara/Check.js"; +import System from "@specs-feup/lara/api/lara/System.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; import Clava from "../Clava.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import { FileJp } from "../../Joinpoints.js"; /** * Parses C/C++ files. diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeDeclStmt.js b/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeDeclStmt.js index b46008828..6a084a124 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeDeclStmt.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeDeclStmt.js @@ -1,5 +1,5 @@ -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { DeclStmt } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; /** diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeVarDeclarations.js b/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeVarDeclarations.js index 094821462..b31bc7710 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeVarDeclarations.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/DecomposeVarDeclarations.js @@ -1,5 +1,5 @@ -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { ArrayType, UndefinedType, Vardecl, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; /** diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/LocalStaticToGlobal.js b/ClavaLaraApi/src-lara/clava/clava/pass/LocalStaticToGlobal.js index 85d018e0d..66f777efa 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/LocalStaticToGlobal.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/LocalStaticToGlobal.js @@ -1,6 +1,6 @@ -import PassTransformationError from "lara-js/api/lara/pass/PassTransformationError.js"; -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import PassTransformationError from "@specs-feup/lara/api/lara/pass/PassTransformationError.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { DeclStmt, StorageClass, Vardecl, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; /** diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyLoops.js b/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyLoops.js index 3c324b75d..dca872b41 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyLoops.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyLoops.js @@ -1,5 +1,5 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { DeclStmt, Loop } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; import DoToWhileStmt from "../code/DoToWhileStmt.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyReturnStmts.js b/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyReturnStmts.js index 74e6e7f8f..d72d8202e 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyReturnStmts.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/SimplifyReturnStmts.js @@ -1,6 +1,6 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { ReturnStmt } from "../../Joinpoints.js"; // TODO: Refactor to use the SimplePass pattern export default class SimplifyReturnStmts extends Pass { diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/SimplifySelectionStmts.js b/ClavaLaraApi/src-lara/clava/clava/pass/SimplifySelectionStmts.js index 928c6c5c6..73c4064da 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/SimplifySelectionStmts.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/SimplifySelectionStmts.js @@ -1,6 +1,6 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { If } from "../../Joinpoints.js"; // TODO: Refactor to use the SimplePass pattern export default class SimplifySelectionStmts extends Pass { diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/SingleReturnFunction.js b/ClavaLaraApi/src-lara/clava/clava/pass/SingleReturnFunction.js index a13c51cbc..1d25f4fa6 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/SingleReturnFunction.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/SingleReturnFunction.js @@ -1,6 +1,6 @@ -import Pass from "lara-js/api/lara/pass/Pass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; -import Query from "lara-js/api/weaver/Query.js"; +import Pass from "@specs-feup/lara/api/lara/pass/Pass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BuiltinType, FunctionJp, ReturnStmt, } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; import DecomposeVarDeclarations from "./DecomposeVarDeclarations.js"; diff --git a/ClavaLaraApi/src-lara/clava/clava/pass/TransformSwitchToIf.js b/ClavaLaraApi/src-lara/clava/clava/pass/TransformSwitchToIf.js index 99b67e548..b5447b642 100644 --- a/ClavaLaraApi/src-lara/clava/clava/pass/TransformSwitchToIf.js +++ b/ClavaLaraApi/src-lara/clava/clava/pass/TransformSwitchToIf.js @@ -1,7 +1,7 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; -import SimplePass from "lara-js/api/lara/pass/SimplePass.js"; -import PassResult from "lara-js/api/lara/pass/results/PassResult.js"; +import SimplePass from "@specs-feup/lara/api/lara/pass/SimplePass.js"; +import PassResult from "@specs-feup/lara/api/lara/pass/results/PassResult.js"; import { Break, GotoStmt, Switch, } from "../../Joinpoints.js"; /** * Transforms a switch statement into an if statement. diff --git a/ClavaLaraApi/src-lara/clava/clava/stats/OpsCounter.js b/ClavaLaraApi/src-lara/clava/clava/stats/OpsCounter.js index 6ac353174..816a46892 100644 --- a/ClavaLaraApi/src-lara/clava/clava/stats/OpsCounter.js +++ b/ClavaLaraApi/src-lara/clava/clava/stats/OpsCounter.js @@ -1,7 +1,7 @@ import ClavaJoinPoints from "../ClavaJoinPoints.js"; import GlobalVariable from "../code/GlobalVariable.js"; -import Query from "lara-js/api/weaver/Query.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; import Logger from "../../lara/code/Logger.js"; import { BuiltinType, Call, FunctionJp, Op, } from "../../Joinpoints.js"; /** diff --git a/ClavaLaraApi/src-lara/clava/clava/stats/StaticOpsCounter.js b/ClavaLaraApi/src-lara/clava/clava/stats/StaticOpsCounter.js index 11cf076cd..89952549a 100644 --- a/ClavaLaraApi/src-lara/clava/clava/stats/StaticOpsCounter.js +++ b/ClavaLaraApi/src-lara/clava/clava/stats/StaticOpsCounter.js @@ -1,5 +1,5 @@ -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; -import Query from "lara-js/api/weaver/Query.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { BinaryOp, BuiltinType, Call, FunctionJp, Loop, Op, Param, Varref, } from "../../Joinpoints.js"; import OpsBlock from "./OpsBlock.js"; export default class StaticOpsCounter { diff --git a/ClavaLaraApi/src-lara/clava/clava/util/ClavaDataStore.js b/ClavaLaraApi/src-lara/clava/clava/util/ClavaDataStore.js index b86353fa2..0feeb7301 100644 --- a/ClavaLaraApi/src-lara/clava/clava/util/ClavaDataStore.js +++ b/ClavaLaraApi/src-lara/clava/clava/util/ClavaDataStore.js @@ -1,8 +1,8 @@ -import WeaverDataStore from "lara-js/api/weaver/util/WeaverDataStore.js"; +import WeaverDataStore from "@specs-feup/lara/api/weaver/util/WeaverDataStore.js"; import ClavaJavaTypes from "../ClavaJavaTypes.js"; -import JavaTypes from "lara-js/api/lara/util/JavaTypes.js"; -import Io from "lara-js/api/lara/Io.js"; -import { arrayFromArgs } from "lara-js/api/lara/core/LaraCore.js"; +import JavaTypes from "@specs-feup/lara/api/lara/util/JavaTypes.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { arrayFromArgs } from "@specs-feup/lara/api/lara/core/LaraCore.js"; /** * DataStore used in Clava. * diff --git a/ClavaLaraApi/src-lara/clava/clava/util/CodeInserter.js b/ClavaLaraApi/src-lara/clava/clava/util/CodeInserter.js index 4bd9a394e..864553213 100644 --- a/ClavaLaraApi/src-lara/clava/clava/util/CodeInserter.js +++ b/ClavaLaraApi/src-lara/clava/clava/util/CodeInserter.js @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import LineInserter from "lara-js/api/lara/util/LineInserter.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import LineInserter from "@specs-feup/lara/api/lara/util/LineInserter.js"; import Clava from "../Clava.js"; /** * Writes the original code of the application, with the possibility of inserting new lines of code. diff --git a/ClavaLaraApi/src-lara/clava/clava/util/FileIterator.js b/ClavaLaraApi/src-lara/clava/clava/util/FileIterator.js index df0ec1618..c1fea73d6 100644 --- a/ClavaLaraApi/src-lara/clava/clava/util/FileIterator.js +++ b/ClavaLaraApi/src-lara/clava/clava/util/FileIterator.js @@ -1,5 +1,5 @@ -import Io from "lara-js/api/lara/Io.js"; -import { debug } from "lara-js/api/lara/core/LaraCore.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import { debug } from "@specs-feup/lara/api/lara/core/LaraCore.js"; import Clava from "../Clava.js"; /** * Given a folder, collects sources in that folder, parses and returns one each time next() is called. diff --git a/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHls.js b/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHls.js index 59c16a133..4de2a4566 100644 --- a/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHls.js +++ b/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHls.js @@ -1,9 +1,9 @@ import Clava from "../Clava.js"; -import ProcessExecutor from "lara-js/api/lara/util/ProcessExecutor.js"; +import ProcessExecutor from "@specs-feup/lara/api/lara/util/ProcessExecutor.js"; import VitisHlsReportParser from "./VitisHlsReportParser.js"; -import Tool from "lara-js/api/lara/tool/Tool.js"; -import ToolUtils from "lara-js/api/lara/tool/ToolUtils.js"; -import Io from "lara-js/api/lara/Io.js"; +import Tool from "@specs-feup/lara/api/lara/tool/Tool.js"; +import ToolUtils from "@specs-feup/lara/api/lara/tool/ToolUtils.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; export default class VitisHls extends Tool { topFunction; platform; @@ -59,7 +59,10 @@ export default class VitisHls extends Tool { Io.deleteFolderContents(this.vitisDir); } getSynthesisReportPath() { - return this.vitisDir + "/" + this.vitisProjName + "/solution1/syn/report/csynth.xml"; + return (this.vitisDir + + "/" + + this.vitisProjName + + "/solution1/syn/report/csynth.xml"); } executeVitis(verbose) { console.log(`${this.getTimestamp()} Executing Vitis HLS`); diff --git a/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsReportParser.js b/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsReportParser.js index 5468826a6..b7a120413 100644 --- a/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsReportParser.js +++ b/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsReportParser.js @@ -1,4 +1,4 @@ -import Io from "lara-js/api/lara/Io.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; export default class VitisHlsReportParser { reportPath; constructor(reportPath) { diff --git a/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsUtils.js b/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsUtils.js index 0d579be22..3f06d40ff 100644 --- a/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsUtils.js +++ b/ClavaLaraApi/src-lara/clava/clava/vitishls/VitisHlsUtils.js @@ -1,4 +1,4 @@ -import Query from "lara-js/api/weaver/Query.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; import { WrapperStmt } from "../../Joinpoints.js"; import ClavaJoinPoints from "../ClavaJoinPoints.js"; export default class VitisHlsUtils { diff --git a/ClavaLaraApi/src-lara/clava/core.js b/ClavaLaraApi/src-lara/clava/core.js index 342742d4f..a4fdf24c2 100644 --- a/ClavaLaraApi/src-lara/clava/core.js +++ b/ClavaLaraApi/src-lara/clava/core.js @@ -4,7 +4,7 @@ * Do not use this file in new (clava-js) projects. * Remove this file if Clava Classic has died out. */ -const prefix = "clava-js/api/"; +const prefix = "@specs-feup/clava/api/"; const coreImports = []; const sideEffectsOnlyImports = ["Joinpoints.js"]; for (const sideEffectsOnlyImport of sideEffectsOnlyImports) { diff --git a/ClavaLaraApi/src-lara/clava/lara/benchmark/ClavaBenchmarkInstance.js b/ClavaLaraApi/src-lara/clava/lara/benchmark/ClavaBenchmarkInstance.js index ceaf0d301..0ce8754cd 100644 --- a/ClavaLaraApi/src-lara/clava/lara/benchmark/ClavaBenchmarkInstance.js +++ b/ClavaLaraApi/src-lara/clava/lara/benchmark/ClavaBenchmarkInstance.js @@ -1,7 +1,7 @@ -import Io from "lara-js/api/lara/Io.js"; -import BenchmarkInstance from "lara-js/api/lara/benchmark/BenchmarkInstance.js"; -import Query from "lara-js/api/weaver/Query.js"; -import Weaver from "lara-js/api/weaver/Weaver.js"; +import Io from "@specs-feup/lara/api/lara/Io.js"; +import BenchmarkInstance from "@specs-feup/lara/api/lara/benchmark/BenchmarkInstance.js"; +import Query from "@specs-feup/lara/api/weaver/Query.js"; +import Weaver from "@specs-feup/lara/api/weaver/Weaver.js"; import Clava from "../..//clava/Clava.js"; import { Pragma } from "../../Joinpoints.js"; import CMaker from "../../clava/cmake/CMaker.js"; diff --git a/ClavaLaraApi/src-lara/clava/lara/code/Energy.js b/ClavaLaraApi/src-lara/clava/lara/code/Energy.js index d9438c70a..12476195b 100644 --- a/ClavaLaraApi/src-lara/clava/lara/code/Energy.js +++ b/ClavaLaraApi/src-lara/clava/lara/code/Energy.js @@ -1,8 +1,8 @@ -import EnergyBase from "lara-js/api/lara/code/EnergyBase.js"; +import EnergyBase from "@specs-feup/lara/api/lara/code/EnergyBase.js"; import Clava from "../../clava/Clava.js"; import Logger from "./Logger.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; export default class Energy extends EnergyBase { /** * Current SpecsRapl library measures uJ. @@ -26,7 +26,8 @@ export default class Energy extends EnergyBase { // Add include const $file = $start.getAncestor("file"); if ($file === undefined) { - console.log("Could not find the corresponding file of the given joinpoint: " + $start.joinPointType); + console.log("Could not find the corresponding file of the given joinpoint: " + + $start.joinPointType); return; } $file.addInclude("rapl.h", false); diff --git a/ClavaLaraApi/src-lara/clava/lara/code/Logger.js b/ClavaLaraApi/src-lara/clava/lara/code/Logger.js index 04142e852..abf68fdfe 100644 --- a/ClavaLaraApi/src-lara/clava/lara/code/Logger.js +++ b/ClavaLaraApi/src-lara/clava/lara/code/Logger.js @@ -1,6 +1,6 @@ -import LoggerBase from "lara-js/api/lara/code/LoggerBase.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import PrintOnce from "lara-js/api/lara/util/PrintOnce.js"; +import LoggerBase from "@specs-feup/lara/api/lara/code/LoggerBase.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import PrintOnce from "@specs-feup/lara/api/lara/util/PrintOnce.js"; import Clava from "../../clava/Clava.js"; import { FunctionJp, Scope, } from "../../Joinpoints.js"; export default class Logger extends LoggerBase { diff --git a/ClavaLaraApi/src-lara/clava/lara/code/Timer.js b/ClavaLaraApi/src-lara/clava/lara/code/Timer.js index 42ac34938..234a5f237 100644 --- a/ClavaLaraApi/src-lara/clava/lara/code/Timer.js +++ b/ClavaLaraApi/src-lara/clava/lara/code/Timer.js @@ -1,7 +1,7 @@ -import Platforms from "lara-js/api/lara/Platforms.js"; -import TimerBase from "lara-js/api/lara/code/TimerBase.js"; -import IdGenerator from "lara-js/api/lara/util/IdGenerator.js"; -import { TimerUnit } from "lara-js/api/lara/util/TimeUnits.js"; +import Platforms from "@specs-feup/lara/api/lara/Platforms.js"; +import TimerBase from "@specs-feup/lara/api/lara/code/TimerBase.js"; +import IdGenerator from "@specs-feup/lara/api/lara/util/IdGenerator.js"; +import { TimerUnit } from "@specs-feup/lara/api/lara/util/TimeUnits.js"; import { Scope } from "../../Joinpoints.js"; import Clava from "../../clava/Clava.js"; import ClavaJoinPoints from "../../clava/ClavaJoinPoints.js"; @@ -50,11 +50,10 @@ export default class Timer extends TimerBase { // Declare variable for time interval, which uses calculation as initialization const timeIntervalVar = IdGenerator.next("clava_timing_duration_"); // Create literal node with calculation of time interval - const $timingResult = ClavaJoinPoints.exprLiteral("long long " + this._timer_cpp_calc_interval(startVar, endVar, cppUnit, timeIntervalVar)); + const $timingResult = ClavaJoinPoints.exprLiteral("long long " + + this._timer_cpp_calc_interval(startVar, endVar, cppUnit, timeIntervalVar)); // Build message - logger - .append(prefix) - .appendLong(timeIntervalVar); + logger.append(prefix).appendLong(timeIntervalVar); if (this.printUnit) { logger.append(this.timeUnits.getUnitsString()); } diff --git a/ClavaLaraApi/src-lara/clava/lara/metrics/EnergyMetric.js b/ClavaLaraApi/src-lara/clava/lara/metrics/EnergyMetric.js index dce986678..218425924 100644 --- a/ClavaLaraApi/src-lara/clava/lara/metrics/EnergyMetric.js +++ b/ClavaLaraApi/src-lara/clava/lara/metrics/EnergyMetric.js @@ -1,6 +1,6 @@ -import Strings from "lara-js/api/lara/Strings.js"; -import Metric from "lara-js/api/lara/metrics/Metric.js"; -import MetricResult from "lara-js/api/lara/metrics/MetricResult.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import Metric from "@specs-feup/lara/api/lara/metrics/Metric.js"; +import MetricResult from "@specs-feup/lara/api/lara/metrics/MetricResult.js"; import Energy from "../code/Energy.js"; /** * Measures energy consumed during an application. diff --git a/ClavaLaraApi/src-lara/clava/lara/metrics/ExecutionTimeMetric.js b/ClavaLaraApi/src-lara/clava/lara/metrics/ExecutionTimeMetric.js index a6b8f505b..9aa95cab3 100644 --- a/ClavaLaraApi/src-lara/clava/lara/metrics/ExecutionTimeMetric.js +++ b/ClavaLaraApi/src-lara/clava/lara/metrics/ExecutionTimeMetric.js @@ -1,7 +1,7 @@ -import Strings from "lara-js/api/lara/Strings.js"; -import Metric from "lara-js/api/lara/metrics/Metric.js"; -import MetricResult from "lara-js/api/lara/metrics/MetricResult.js"; -import { TimerUnit } from "lara-js/api/lara/util/TimeUnits.js"; +import Strings from "@specs-feup/lara/api/lara/Strings.js"; +import Metric from "@specs-feup/lara/api/lara/metrics/Metric.js"; +import MetricResult from "@specs-feup/lara/api/lara/metrics/MetricResult.js"; +import { TimerUnit } from "@specs-feup/lara/api/lara/util/TimeUnits.js"; import Timer from "../code/Timer.js"; /** * Measures execution time of an application. diff --git a/ClavaLaraApi/src-lara/clava/weaver/WeaverLauncher.js b/ClavaLaraApi/src-lara/clava/weaver/WeaverLauncher.js index 933cd225e..82b6e4710 100644 --- a/ClavaLaraApi/src-lara/clava/weaver/WeaverLauncher.js +++ b/ClavaLaraApi/src-lara/clava/weaver/WeaverLauncher.js @@ -1,4 +1,4 @@ -import WeaverLauncherBase from "lara-js/api/weaver/WeaverLauncherBase.js"; +import WeaverLauncherBase from "@specs-feup/lara/api/weaver/WeaverLauncherBase.js"; import Clava from "../clava/Clava.js"; export default class WeaverLauncher extends WeaverLauncherBase { execute(args) { diff --git a/ClavaWeaver/build.gradle b/ClavaWeaver/build.gradle index 5381e87f5..dc05b0182 100644 --- a/ClavaWeaver/build.gradle +++ b/ClavaWeaver/build.gradle @@ -105,4 +105,23 @@ task clava(type: JavaExec) { classpath = sourceSets.main.runtimeClasspath mainClass = 'pt.up.fe.specs.clava.weaver.ClavaWeaverLauncher' args = [] +} + +// Clava Doc (old version) +task clavadoc(type: JavaExec) { + group = "Execution" + description = "Generates Documentation (Legacy)" + classpath = sourceSets.main.runtimeClasspath + mainClass = 'pt.up.fe.specs.clava.weaver.ClavaWeaverLauncher' + args = [ + '-doc', + '--output', + '"../docs/api"', + '--clean', + '--exclude', + '_', + '--packages', +// '{"Clava API": ["../ClavaLaraApi/src-lara-clava/clava"], "LARA API": ["../LaraApi/src-lara-base","../LaraApi}/src-lara","../LARAI/src-lara","../LaraExtraApi/src-lara","../ClavaLaraApi/src-lara/clava"], "LARA Common Language API": ["../LaraCommonLanguageApi/src-lara"], "ANTAREX API": ["../AntarexClavaApi/src-lara/clava"]}', + '{\'Clava API\': [\'../ClavaLaraApi/src-lara-clava/clava\'], \'LARA API\': [\'../LaraApi/src-lara-base\',\'../LaraApi}/src-lara\',\'../LARAI/src-lara\',\'../LaraExtraApi/src-lara\',\'../ClavaLaraApi/src-lara/clava\'], \'LARA Common Language API\': [\'../LaraCommonLanguageApi/src-lara\'], \'ANTAREX API\': [\'../AntarexClavaApi/src-lara/clava\']}', + ] } \ No newline at end of file diff --git a/ClavaWeaver/resources/clava/weaverspecs/actionModel.xml b/ClavaWeaver/resources/clava/weaverspecs/actionModel.xml index 4874d028f..9ba206a66 100644 --- a/ClavaWeaver/resources/clava/weaverspecs/actionModel.xml +++ b/ClavaWeaver/resources/clava/weaverspecs/actionModel.xml @@ -91,12 +91,12 @@ https://docs.google.com/document/d/1uPrvuVBXHSbjDTfehpEeLDz9hgIr8EuJJJvBc5A70rs/ - + - + diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.java index f1b334584..1fc14ff66 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.java @@ -171,7 +171,7 @@ public static List getDefaultFlags() { return DEFAULT_DUMPER_FLAGS; } - private static final String CLAVA_API_NAME = "clava-js"; + private static final String CLAVA_API_NAME = "@specs-feup/clava"; private static final List CLAVA_LARA_API = new ArrayList<>(); static { diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.json b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.json index 4b182d01a..9f82f0bc5 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.json +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/CxxWeaver.json @@ -826,10 +826,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -868,10 +868,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -1809,10 +1809,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -1851,10 +1851,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -3035,10 +3035,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -3077,10 +3077,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -4104,10 +4104,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -4146,10 +4146,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -5343,10 +5343,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -5385,10 +5385,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -6315,10 +6315,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -6357,10 +6357,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -7412,10 +7412,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -7454,10 +7454,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -8743,10 +8743,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -8785,10 +8785,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -9763,10 +9763,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -9805,10 +9805,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -10827,10 +10827,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -10869,10 +10869,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -12097,10 +12097,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -12139,10 +12139,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -13373,10 +13373,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -13415,10 +13415,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -14482,10 +14482,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -14524,10 +14524,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -15527,10 +15527,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -15569,10 +15569,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -16941,10 +16941,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -16983,10 +16983,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -18217,10 +18217,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -18259,10 +18259,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -19272,10 +19272,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -19314,10 +19314,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -20491,10 +20491,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -20533,10 +20533,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -21480,10 +21480,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -21522,10 +21522,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -22465,10 +22465,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -22507,10 +22507,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -23520,10 +23520,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -23562,10 +23562,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -24830,10 +24830,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -24872,10 +24872,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -25804,10 +25804,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -25846,10 +25846,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -26868,10 +26868,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -26910,10 +26910,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -27917,10 +27917,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -27959,10 +27959,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -28929,10 +28929,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -28971,10 +28971,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -30174,10 +30174,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -30216,10 +30216,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -31139,10 +31139,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -31181,10 +31181,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -32194,10 +32194,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -32236,10 +32236,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -33256,10 +33256,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -33298,10 +33298,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -34498,10 +34498,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -34540,10 +34540,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -35546,10 +35546,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -35588,10 +35588,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -36610,10 +36610,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -36652,10 +36652,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -37622,10 +37622,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -37664,10 +37664,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -38671,10 +38671,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -38713,10 +38713,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -40058,10 +40058,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -40100,10 +40100,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -41078,10 +41078,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -41120,10 +41120,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -42613,10 +42613,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -42655,10 +42655,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -43879,10 +43879,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -43921,10 +43921,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -44956,10 +44956,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -44998,10 +44998,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -46110,10 +46110,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -46152,10 +46152,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -47122,10 +47122,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -47164,10 +47164,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -48124,10 +48124,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -48166,10 +48166,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -49145,10 +49145,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -49187,10 +49187,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -50165,10 +50165,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -50207,10 +50207,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -51213,10 +51213,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -51255,10 +51255,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -52290,10 +52290,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -52332,10 +52332,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -53302,10 +53302,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -53344,10 +53344,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -54716,10 +54716,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -54758,10 +54758,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -55776,10 +55776,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -55818,10 +55818,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -56843,10 +56843,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -56885,10 +56885,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -58135,10 +58135,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -58177,10 +58177,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -59687,10 +59687,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -59729,10 +59729,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -60736,10 +60736,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -60778,10 +60778,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -61748,10 +61748,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -61790,10 +61790,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -63229,10 +63229,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -63271,10 +63271,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -64266,10 +64266,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -64308,10 +64308,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -65447,10 +65447,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -65489,10 +65489,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -66468,10 +66468,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -66510,10 +66510,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -67707,10 +67707,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -67749,10 +67749,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -68955,10 +68955,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -68997,10 +68997,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -69993,10 +69993,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -70035,10 +70035,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -71275,10 +71275,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -71317,10 +71317,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -72508,10 +72508,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -72550,10 +72550,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -73618,10 +73618,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -73660,10 +73660,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -74686,10 +74686,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -74728,10 +74728,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -76018,10 +76018,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -76060,10 +76060,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -77073,10 +77073,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -77115,10 +77115,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -78183,10 +78183,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -78225,10 +78225,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -79274,10 +79274,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -79316,10 +79316,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -80321,10 +80321,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -80363,10 +80363,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -81555,10 +81555,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -81597,10 +81597,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -82804,10 +82804,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -82846,10 +82846,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -83880,10 +83880,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -83922,10 +83922,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -84892,10 +84892,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -84934,10 +84934,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -86109,10 +86109,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -86151,10 +86151,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -87158,10 +87158,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -87200,10 +87200,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -88207,10 +88207,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -88249,10 +88249,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -89443,10 +89443,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -89485,10 +89485,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -90508,10 +90508,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -90550,10 +90550,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -91566,10 +91566,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -91608,10 +91608,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -92783,10 +92783,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -92825,10 +92825,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -93965,10 +93965,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -94007,10 +94007,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -95226,10 +95226,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -95268,10 +95268,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -96313,10 +96313,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -96355,10 +96355,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { @@ -97384,10 +97384,10 @@ }, { "type": "action", - "tooltip": "Replaces the first child, or inserts the join point if no child is present", + "tooltip": "Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setFirstChild" }, { @@ -97426,10 +97426,10 @@ }, { "type": "action", - "tooltip": "Replaces the last child, or inserts the join point if no child is present", + "tooltip": "Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present.", "children": [ { - "type": "void", + "type": "joinpoint", "name": "setLastChild" }, { diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/ACxxWeaverJoinPoint.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/ACxxWeaverJoinPoint.java index 735e67b13..25b5d7f82 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/ACxxWeaverJoinPoint.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/ACxxWeaverJoinPoint.java @@ -1248,20 +1248,21 @@ public AJoinPoint getFirstChildImpl() { @Override public void defFirstChildImpl(AJoinPoint value) { + setFirstChildImpl(value); + } + @Override + public AJoinPoint setFirstChildImpl(AJoinPoint value) { // If no children, just insert the node if (!getHasChildrenImpl()) { getNode().addChild(value.getNode()); - return; + return null; } // Otherwise, replace node - getFirstChildImpl().replaceWith(value); - } - - @Override - public void setFirstChildImpl(AJoinPoint node) { - defFirstChildImpl(node); + var firstChild = getFirstChildImpl(); + firstChild.replaceWith(value); + return firstChild; } @Override @@ -1279,19 +1280,21 @@ public AJoinPoint getLastChildImpl() { @Override public void defLastChildImpl(AJoinPoint value) { + setLastChildImpl(value); + } + + @Override + public AJoinPoint setLastChildImpl(AJoinPoint value) { // If no children, just insert the node if (!getHasChildrenImpl()) { getNode().addChild(value.getNode()); - return; + return null; } // Otherwise, replace node - getLastChildImpl().replaceWith(value); - } - - @Override - public void setLastChildImpl(AJoinPoint node) { - defLastChildImpl(node); + var lastChild =getLastChildImpl(); + lastChild.replaceWith(value); + return lastChild; } @Override diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAccessSpecifier.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAccessSpecifier.java index 82ca98890..cd25b04ee 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAccessSpecifier.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAccessSpecifier.java @@ -768,21 +768,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAdjustedType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAdjustedType.java index 91e77db46..160e62ed7 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAdjustedType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AAdjustedType.java @@ -944,21 +944,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayAccess.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayAccess.java index 6ffd1959c..0715e274c 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayAccess.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayAccess.java @@ -932,21 +932,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayType.java index 7064df04b..baa478ea9 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AArrayType.java @@ -980,21 +980,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABinaryOp.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABinaryOp.java index dd717c2e0..247f0a6d5 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABinaryOp.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABinaryOp.java @@ -977,21 +977,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aOp.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aOp.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aOp.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aOp.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABody.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABody.java index 054fc57b6..f9e00d15d 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABody.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABody.java @@ -1075,21 +1075,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aScope.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aScope.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aScope.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aScope.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABoolLiteral.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABoolLiteral.java index 7d471a7aa..478338c71 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABoolLiteral.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABoolLiteral.java @@ -816,21 +816,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aLiteral.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aLiteral.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aLiteral.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aLiteral.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABreak.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABreak.java index 438def5d8..93db78a21 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABreak.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABreak.java @@ -912,21 +912,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABuiltinType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABuiltinType.java index 4d2428ac6..e95da2146 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABuiltinType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ABuiltinType.java @@ -1061,21 +1061,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACall.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACall.java index a46f6a483..10a8a69f4 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACall.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACall.java @@ -1418,21 +1418,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACase.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACase.java index f203d727c..067d6a6be 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACase.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACase.java @@ -1047,21 +1047,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACast.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACast.java index 09ae65027..c86b00f05 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACast.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACast.java @@ -888,21 +888,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkFor.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkFor.java index 0f4c764cf..341b87de4 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkFor.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkFor.java @@ -1146,21 +1146,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aLoop.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aLoop.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aLoop.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aLoop.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSpawn.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSpawn.java index 42887a170..73d271faa 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSpawn.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSpawn.java @@ -958,21 +958,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aCall.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aCall.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aCall.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aCall.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSync.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSync.java index f1200a373..ce7e82bce 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSync.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACilkSync.java @@ -887,21 +887,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AClass.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AClass.java index a32fd9489..347db7b19 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AClass.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AClass.java @@ -1173,21 +1173,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aRecord.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aRecord.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aRecord.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aRecord.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AContinue.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AContinue.java index 90a033b17..3c63f0ee5 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AContinue.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AContinue.java @@ -887,21 +887,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACudaKernelCall.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACudaKernelCall.java index 830f18b32..b2287a944 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACudaKernelCall.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ACudaKernelCall.java @@ -1055,21 +1055,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aCall.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aCall.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aCall.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aCall.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclStmt.java index 931e5c86f..80c3844f7 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclStmt.java @@ -922,21 +922,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclarator.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclarator.java index 787793f48..0e20d68df 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclarator.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeclarator.java @@ -801,21 +801,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aNamedDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aNamedDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aNamedDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aNamedDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeleteExpr.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeleteExpr.java index 728fa95fc..a3537ff44 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeleteExpr.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ADeleteExpr.java @@ -788,21 +788,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AElaboratedType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AElaboratedType.java index 68dcc3f0d..7b955f839 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AElaboratedType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AElaboratedType.java @@ -990,21 +990,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEmptyStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEmptyStmt.java index 2494c9104..853344b27 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEmptyStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEmptyStmt.java @@ -887,21 +887,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumDecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumDecl.java index 7864384ff..918ca3e7f 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumDecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumDecl.java @@ -847,21 +847,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aNamedDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aNamedDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aNamedDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aNamedDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumType.java index c733f02dc..d15654adf 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumType.java @@ -965,21 +965,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aTagType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aTagType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aTagType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aTagType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumeratorDecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumeratorDecl.java index 0014db338..e50282a31 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumeratorDecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AEnumeratorDecl.java @@ -801,21 +801,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aNamedDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aNamedDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aNamedDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aNamedDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AExprStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AExprStmt.java index 0e5bdb238..749d8347f 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AExprStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AExprStmt.java @@ -912,21 +912,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AField.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AField.java index cb222d107..e968216f2 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AField.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AField.java @@ -801,21 +801,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aDeclarator.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aDeclarator.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aDeclarator.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aDeclarator.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFloatLiteral.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFloatLiteral.java index 423ecf328..fcb8163be 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFloatLiteral.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFloatLiteral.java @@ -816,21 +816,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aLiteral.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aLiteral.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aLiteral.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aLiteral.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunction.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunction.java index 615d75b24..ffb2977cf 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunction.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunction.java @@ -1924,21 +1924,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aDeclarator.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aDeclarator.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aDeclarator.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aDeclarator.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunctionType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunctionType.java index a7bfe8b7a..3bb5ef54b 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunctionType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AFunctionType.java @@ -1043,21 +1043,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AGotoStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AGotoStmt.java index 457af84e0..edef193e7 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AGotoStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AGotoStmt.java @@ -948,21 +948,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIf.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIf.java index 5609d93c0..b61d96a3f 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIf.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIf.java @@ -1130,21 +1130,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AImplicitValue.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AImplicitValue.java index 50e2b8432..d3d33106b 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AImplicitValue.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AImplicitValue.java @@ -788,21 +788,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInclude.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInclude.java index d1392259d..bcfd0ae1e 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInclude.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInclude.java @@ -814,21 +814,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInitList.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInitList.java index f9faa31ab..96e9ab11c 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInitList.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AInitList.java @@ -813,21 +813,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIntLiteral.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIntLiteral.java index 8e85d0729..e5a102386 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIntLiteral.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AIntLiteral.java @@ -816,21 +816,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aLiteral.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aLiteral.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aLiteral.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aLiteral.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AJoinPoint.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AJoinPoint.java index 2193663af..3d69cae68 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AJoinPoint.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AJoinPoint.java @@ -579,52 +579,54 @@ public final void removeChildren() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ - public void setFirstChildImpl(AJoinPoint node) { + public AJoinPoint setFirstChildImpl(AJoinPoint node) { throw new UnsupportedOperationException(get_class()+": Action setFirstChild not implemented "); } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ - public final void setFirstChild(AJoinPoint node) { + public final Object setFirstChild(AJoinPoint node) { try { if(hasListeners()) { eventTrigger().triggerAction(Stage.BEGIN, "setFirstChild", this, Optional.empty(), node); } - this.setFirstChildImpl(node); + AJoinPoint result = this.setFirstChildImpl(node); if(hasListeners()) { - eventTrigger().triggerAction(Stage.END, "setFirstChild", this, Optional.empty(), node); + eventTrigger().triggerAction(Stage.END, "setFirstChild", this, Optional.ofNullable(result), node); } + return result!=null?result:getUndefinedValue(); } catch(Exception e) { throw new ActionException(get_class(), "setFirstChild", e); } } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ - public void setLastChildImpl(AJoinPoint node) { + public AJoinPoint setLastChildImpl(AJoinPoint node) { throw new UnsupportedOperationException(get_class()+": Action setLastChild not implemented "); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ - public final void setLastChild(AJoinPoint node) { + public final Object setLastChild(AJoinPoint node) { try { if(hasListeners()) { eventTrigger().triggerAction(Stage.BEGIN, "setLastChild", this, Optional.empty(), node); } - this.setLastChildImpl(node); + AJoinPoint result = this.setLastChildImpl(node); if(hasListeners()) { - eventTrigger().triggerAction(Stage.END, "setLastChild", this, Optional.empty(), node); + eventTrigger().triggerAction(Stage.END, "setLastChild", this, Optional.ofNullable(result), node); } + return result!=null?result:getUndefinedValue(); } catch(Exception e) { throw new ActionException(get_class(), "setLastChild", e); } diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelDecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelDecl.java index b4dabe8bc..af59756de 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelDecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelDecl.java @@ -801,21 +801,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aNamedDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aNamedDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aNamedDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aNamedDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelStmt.java index 8a58206bc..a5d6a29b6 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALabelStmt.java @@ -948,21 +948,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALiteral.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALiteral.java index c5bd06e1c..9598f72f5 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALiteral.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALiteral.java @@ -788,21 +788,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALoop.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALoop.java index 718f779cd..042fa06a6 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALoop.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ALoop.java @@ -1752,21 +1752,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMarker.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMarker.java index 553dc04bf..23fdb3416 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMarker.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMarker.java @@ -838,21 +838,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aPragma.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aPragma.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aPragma.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aPragma.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberAccess.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberAccess.java index 5cdee2d0d..77d280367 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberAccess.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberAccess.java @@ -965,21 +965,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberCall.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberCall.java index 5c003b93e..5fd812ca4 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberCall.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMemberCall.java @@ -1010,21 +1010,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aCall.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aCall.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aCall.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aCall.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMethod.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMethod.java index 9f3298a0a..6e173b9be 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMethod.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AMethod.java @@ -1131,21 +1131,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aFunction.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aFunction.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aFunction.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aFunction.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANamedDecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANamedDecl.java index 7fbffe0f3..0d1d357f8 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANamedDecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANamedDecl.java @@ -945,21 +945,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANewExpr.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANewExpr.java index 31cbd5c4e..901de52c1 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANewExpr.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ANewExpr.java @@ -788,21 +788,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOmp.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOmp.java index 1dc4e589c..9df994e84 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOmp.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOmp.java @@ -1806,21 +1806,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aPragma.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aPragma.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aPragma.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aPragma.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOp.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOp.java index be30c60a9..3e4572481 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOp.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AOp.java @@ -863,21 +863,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParam.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParam.java index 29756a8e7..dca70bd37 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParam.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParam.java @@ -880,21 +880,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aVardecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aVardecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aVardecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aVardecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenExpr.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenExpr.java index 1530fde51..1f258c48a 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenExpr.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenExpr.java @@ -813,21 +813,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenType.java index c08502f41..eadb200aa 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AParenType.java @@ -980,21 +980,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/APointerType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/APointerType.java index 655c68300..a67da6a04 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/APointerType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/APointerType.java @@ -1003,21 +1003,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AQualType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AQualType.java index 0d3647b8e..707928a21 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AQualType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AQualType.java @@ -981,21 +981,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ARecord.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ARecord.java index 1d1a4e991..f93aa522d 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ARecord.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ARecord.java @@ -980,21 +980,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aNamedDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aNamedDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aNamedDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aNamedDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AReturnStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AReturnStmt.java index fb6918603..9e6353bbc 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AReturnStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AReturnStmt.java @@ -923,21 +923,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AScope.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AScope.java index 252d8b66f..9b150e079 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AScope.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AScope.java @@ -1484,21 +1484,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AStruct.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AStruct.java index 2d8b81fe3..2fca5d2ac 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AStruct.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AStruct.java @@ -855,21 +855,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aRecord.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aRecord.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aRecord.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aRecord.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ASwitch.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ASwitch.java index 270604fc5..c86ddf1f4 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ASwitch.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ASwitch.java @@ -991,21 +991,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATag.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATag.java index 26f893d70..4de9fd7f3 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATag.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATag.java @@ -804,21 +804,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aPragma.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aPragma.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aPragma.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aPragma.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATagType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATagType.java index b73836308..29120f19a 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATagType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATagType.java @@ -969,21 +969,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATemplateSpecializationType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATemplateSpecializationType.java index ee14d6db5..111ac7222 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATemplateSpecializationType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATemplateSpecializationType.java @@ -1031,21 +1031,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATernaryOp.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATernaryOp.java index 3429587a8..04e9510a0 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATernaryOp.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATernaryOp.java @@ -939,21 +939,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aOp.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aOp.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aOp.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aOp.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AThis.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AThis.java index ecfb21a36..37e6a7891 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AThis.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AThis.java @@ -788,21 +788,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefDecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefDecl.java index b25706bad..577e3001b 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefDecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefDecl.java @@ -801,21 +801,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aTypedefNameDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aTypedefNameDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aTypedefNameDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aTypedefNameDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefNameDecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefNameDecl.java index 2f71ec800..f0295f4ad 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefNameDecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefNameDecl.java @@ -801,21 +801,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aNamedDecl.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aNamedDecl.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aNamedDecl.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aNamedDecl.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefType.java index b0bdbf33f..5fa425b8c 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/ATypedefType.java @@ -967,21 +967,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryExprOrType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryExprOrType.java index 3e2dbb737..d0213218e 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryExprOrType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryExprOrType.java @@ -949,21 +949,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryOp.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryOp.java index cf3f1fdcd..b80eea305 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryOp.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUnaryOp.java @@ -877,21 +877,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aOp.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aOp.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aOp.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aOp.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUndefinedType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUndefinedType.java index c512b26d6..2f5b5abaa 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUndefinedType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AUndefinedType.java @@ -919,21 +919,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVardecl.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVardecl.java index a25f66d35..ee94b914f 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVardecl.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVardecl.java @@ -1110,21 +1110,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aDeclarator.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aDeclarator.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aDeclarator.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aDeclarator.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVariableArrayType.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVariableArrayType.java index 18e9f5bd4..48c8d0a06 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVariableArrayType.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVariableArrayType.java @@ -997,21 +997,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aArrayType.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aArrayType.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aArrayType.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aArrayType.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVarref.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVarref.java index 29dbf6476..c31a491bd 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVarref.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AVarref.java @@ -991,21 +991,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aExpression.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aExpression.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aExpression.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aExpression.setLastChildImpl(node); } /** diff --git a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AWrapperStmt.java b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AWrapperStmt.java index e6883bb6e..42ec4d7a9 100644 --- a/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AWrapperStmt.java +++ b/ClavaWeaver/src/pt/up/fe/specs/clava/weaver/abstracts/joinpoints/AWrapperStmt.java @@ -939,21 +939,21 @@ public void removeChildrenImpl() { } /** - * Replaces the first child, or inserts the join point if no child is present + * Replaces the first child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setFirstChildImpl(AJoinPoint node) { - this.aStatement.setFirstChildImpl(node); + public AJoinPoint setFirstChildImpl(AJoinPoint node) { + return this.aStatement.setFirstChildImpl(node); } /** - * Replaces the last child, or inserts the join point if no child is present + * Replaces the last child, or inserts the join point if no child is present. Returns the replaced child, or undefined if there was no child present. * @param node */ @Override - public void setLastChildImpl(AJoinPoint node) { - this.aStatement.setLastChildImpl(node); + public AJoinPoint setLastChildImpl(AJoinPoint node) { + return this.aStatement.setLastChildImpl(node); } /** diff --git a/README.md b/README.md index 06ae2b307..9f3cd7fb2 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ If you have used Clava, please consider filling the [Clava User Experience Feedb Clava also supports LARA files (`.lara`), but the LARA DSL is now considered legacy, please use JavaScript instead. + # Compatibility Currently Clava requires Java 17