+ * This will clear all work tables which have records for this artifact AST ID, and all
+ * records from the
+ * An artifact must be converted if the artifact file is new, or itself or any of its include files
+ * (from reading the associated
* This would be done in order to safely save a copy AST under a
- * different filename than the source AST. It is necessary in order to
- * avoid having two ASTs registered to the same filename and ID in the
+ * different artifact than the source AST. It is necessary in order to
+ * avoid having two ASTs registered to the same artifact and ID in the
* AST registry.
*
- * @param filename
- * New filename under which the AST is registered.
+ * @param artifact
+ * New artifact under which the AST is registered.
*
* @throws AstException
* if any error occurs registering AST or applying fixups.
*/
- public void brainwash(String filename)
+ public void brainwash(Artifact artifact)
throws AstException;
/**
@@ -1424,12 +1429,12 @@
public int getNumChildren();
/**
- * Get the name of the source file associated with this AST
+ * Get the artifact of the source file associated with this AST.
*
- * @return Name of source file, or
* This would be done in order to safely save a copy AST under a
- * different filename than the source AST. It is necessary in order to
- * avoid having two ASTs registered to the same filename and ID in the
+ * different artifact than the source AST. It is necessary in order to
+ * avoid having two ASTs registered to the same artifact and ID in the
* AST registry.
*
* No shadow nodes will be created using this version of the method. All
* hidden tokens will be dropped.
*
- * @param filename
- * New filename under which the AST is registered.
+ * @param artifact
+ * New artifact under which the AST is registered.
*
* @throws AstException
* if any error occurs registering AST or applying fixups.
*/
@Override
- public void brainwash(String filename)
+ public void brainwash(Artifact artifact)
throws AstException
{
- brainwash(filename, false);
+ brainwash(artifact, false);
}
/**
- * Clear all IDs of an AST and register it under a new filename. The
+ * Clear all IDs of an AST and register it under a new artifact. The
* AST is walked to fix-up all parent-child relationships as part of
* the re-initialization.
*
* This would be done in order to safely save a copy AST under a
- * different filename than the source AST. It is necessary in order to
- * avoid having two ASTs registered to the same filename and ID in the
+ * different artifact than the source AST. It is necessary in order to
+ * avoid having two ASTs registered to the same artifact and ID in the
* AST registry.
*
- * @param filename
- * New filename under which the AST is registered.
+ * @param artifact
+ * New artifact under which the AST is registered.
* @param shadow
*
* An ID of 0xFFFFFFFFFFFFFFFF is invalid and is the equivalent to a
- *
- * Name lookups are done on a case sensitive basis.
+ * Name lookups are done on a case-sensitive basis.
*
* To facilitate multi-threaded applications, a tree level locking facility
* is provided. {@link #lockTree} and {@link #unlockTree} provide a mechanism
@@ -155,7 +162,7 @@
/** A supplier to create the AST manager plugin, which will be saved in the current context. */
private final Supplier
* The program will return a non-zero code if there is a fatal error during the transformation processing.
* Each child class implements its own command line syntax, but the options, modes and 4GL source file
- * lists are handled in a common way. The mode names are driver- specific, however the various front end
+ * lists are handled in a common way. The mode names are driver-specific, however the various front end
* modes are common since all drivers need to be able to create ASTs.
*
* Syntax:
*
- * Corresponds with runtime variable
@@ -1703,15 +1697,24 @@
*/
public String getPersistenceFilename()
{
- String name = getCopy().getFilename();
-
+ String name = getCopy().getArtifact().getRelativePath();
+
if (name == null)
+ {
return null;
-
- StringBuilder buf = new StringBuilder(name);
- buf.append(AstGenerator.AST_POSTFIX);
-
- return buf.toString();
+ }
+
+ return name + AstGenerator.AST_POSTFIX;
+ }
+
+ /**
+ * Get the artifact associated with the current source AST.
+ *
+ * @return Source code artifact.
+ */
+ public Artifact getArtifact()
+ {
+ return getSource().getArtifact();
}
/**
@@ -3513,9 +3516,9 @@
{
Aast root = getCopy().getAncestor(-1);
- StringBuilder buf = new StringBuilder(root.getFilename());
+ StringBuilder buf = new StringBuilder(root.getArtifact().getRelativePath());
buf.append(AstGenerator.AST_POSTFIX);
- String fname = Configuration.normalizeFilename(buf.toString());
+ Artifact fname = ArtifactManager.addArtifact(buf.toString());
AstManager.get().saveTree(root, fname, false);
@@ -3527,11 +3530,11 @@
* convention. This will overwrite any existing file of the same name
* without complaint or warning.
*
- * @param filename
- * The file to persist.
+ * @param artifact
+ * The artifact to persist.
* @param projectRelative
- *
- * If no file exists with the name
- * Syntax:
- *
- * By default, options QCLPX are active. If any options are explicitly
- * specified, all non-specified options are forced off.
- *
- * @param args
- * List of command line arguments.
- */
- public static void main(String[] args)
- {
- // option defaults
- boolean preproc = true;
- boolean cache = true;
- boolean lex = true;
- boolean parse = true;
- boolean persist = true;
- boolean recursion = true;
- boolean silent = false;
- boolean abortOnError = false;
- boolean explicit = false;
- int idx = 0;
-
- // requires (directory and filespec) OR (option -F and a filelist)
- if (args.length < 2)
- {
- syntax("Missing command line parameters.", -1);
- }
-
- // process options
- if (args[0].startsWith("-"))
- {
- idx = 1;
- String opts = args[0].toLowerCase();
-
- if (opts.indexOf('q') != -1) preproc = true;
- else preproc = false;
-
- if (opts.indexOf('c') != -1) cache = true;
- else cache = false;
-
- if (opts.indexOf('l') != -1) lex = true;
- else lex = false;
-
- if (opts.indexOf('p') != -1) parse = true;
- else parse = false;
-
- if (opts.indexOf('x') != -1) persist = true;
- else persist = false;
-
- if (opts.indexOf('n') != -1) recursion = false;
- else recursion = true;
-
- if (opts.indexOf('s') != -1) silent = true;
- else silent = false;
-
- if (opts.indexOf('a') != -1) abortOnError = true;
- else abortOnError = false;
-
- if (opts.indexOf('f') != -1) explicit = true;
- else explicit = false;
- }
-
- FileList files = null;
-
- // at this point idx points to the next arg after the options
- if (explicit)
- {
- int len = args.length;
- String[] filelist = new String[len - idx];
-
- for (int j = idx; j < len; j++)
- {
- filelist[j - 1] = args[j];
- }
-
- files = new ExplicitFileList(filelist);
- }
- else
- {
- // options with filespec mode requires 3 args in total
- if (idx == 1 && args.length < 3)
- {
- syntax("Missing command line parameters.", -2);
- }
-
- files = new FileSpecList(new File(args[idx]),
- args[idx+1],
- recursion);
- }
-
- // drive the scanning
- try
- {
- scan(files, preproc, cache, lex, parse, persist, silent, abortOnError, 0);
- }
- catch (Exception exc)
- {
- // non-zero return to indicate error
- System.exit(1);
- }
- }
}
=== modified file 'src/com/goldencode/p2j/uast/SymbolResolver.java'
--- old/src/com/goldencode/p2j/uast/SymbolResolver.java 2025-04-22 06:57:43 +0000
+++ new/src/com/goldencode/p2j/uast/SymbolResolver.java 2025-05-09 08:09:40 +0000
@@ -607,6 +607,8 @@
import java.util.function.*;
import java.util.logging.*;
+import com.goldencode.artifacts.*;
+import com.goldencode.artifacts.FileSpecList;
import com.goldencode.ast.*;
import com.goldencode.util.*;
import antlr.*;
@@ -740,7 +742,7 @@
* as not all classes might be loaded.
*/
private final ClassDefinition MOCK_CLASS_DEF =
- new ClassDefinition(null, null, null, false, OOType.CLASS, false, "")
+ new ClassDefinition(null, null, null, false, OOType.CLASS, false, null)
{
@Override
public void annotateMethodCall(String mname,
@@ -903,7 +905,7 @@
};
/** Cache of resolved classes, per absolute directory path. */
- private static final Map
* These files will be listed in the directories represented by the
* {@link #OO4GL_PATH}, {@link #DOTNET_PATH} and the {@link #ASSEMBLY_PATH}.
*
- * @return The list of CLASS_DEFINITIONS table.
+ *
+ * @param artifact
+ * The artifact to clear.
+ *
+ * @return An artifact collection containing a list of dependency files.
+ */
+ public static ArtifactCollection cleanArtifact(Artifact artifact)
+ {
+ Set.pphints has changed).
+ * // TODO: move this to Artifact
+ *
+ * @return true if this artifact has changed and must be converted.
+ */
+ public boolean mustConvert()
+ {
+ return ConversionData.mustConvertFile(relativePath);
+ }
+
+ /**
+ * Used for locking the artifact, this method prevents any access or modification of the artifact.
+ */
+ @Override
+ public void lock()
+ {
+ lock.lock();
+ }
+
+ /**
+ * Used for unlocking the artifact, it can only be used when the artifact is locked.
+ */
+ @Override
+ public void unlock()
+ {
+ lock.unlock();
+ }
+
+ /**
+ * Checks if the artifact is locked.
+ *
+ * @return {@code true} if the artifact is locked, {@code false} otherwise.
+ */
+ @Override
+ public boolean tryLock()
+ {
+ return lock.tryLock();
+ }
+
+ /**
+ * Check if the relative path of the artifact ends with the given extension.
+ *
+ * @param extension
+ * The extension that will be checked.
+ *
+ * @return {@code true} If the relative path ends with the given extension, {@code false} otherwise.
+ */
+ @Override
+ public boolean endsWith(String extension)
+ {
+ return relativePath.endsWith(extension);
+ }
+
+ /**
+ * Checks whether some other object is "equal to" this one.
+ *
+ * @param obj
+ * Another object to compare to.
+ *
+ * @return {@code true} if this object is the same as the obj argument.
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+
+ if (!(obj instanceof Artifact))
+ {
+ return false;
+ }
+
+ Artifact o = (Artifact) obj;
+ return id.equals(o.getId()) &&
+ relativePath.equals(o.getRelativePath()) &&
+ absolutePath.equals(o.getAbsolutePath());
+ }
+}
=== renamed file 'src/com/goldencode/p2j/cfg/DirectoryReference.java' => 'src/com/goldencode/artifacts/DirectoryReference.java'
--- old/src/com/goldencode/p2j/cfg/DirectoryReference.java 2022-04-16 18:38:24 +0000
+++ new/src/com/goldencode/artifacts/DirectoryReference.java 2025-05-09 07:59:16 +0000
@@ -2,11 +2,13 @@
** Module : DirectoryReference.java
** Abstract : For a file-set configuration, this represents a directory reference.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -60,7 +62,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
/**
* For a file-set configuration, this represents a directory reference.
=== renamed file 'src/com/goldencode/p2j/cfg/ExcludeFilter.java' => 'src/com/goldencode/artifacts/ExcludeFilter.java'
--- old/src/com/goldencode/p2j/cfg/ExcludeFilter.java 2022-04-16 18:38:24 +0000
+++ new/src/com/goldencode/artifacts/ExcludeFilter.java 2025-05-09 07:59:16 +0000
@@ -2,11 +2,13 @@
** Module : ExcludeFilter.java
** Abstract : For a file-set configuration, this represents the eXclude operation.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -60,7 +62,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
/**
* When a configuration is read from a {@link FileSet}, this represents the eXclude operation, when a set of
=== renamed file 'src/com/goldencode/p2j/util/ExplicitFileList.java' => 'src/com/goldencode/artifacts/ExplicitFileList.java'
--- old/src/com/goldencode/p2j/util/ExplicitFileList.java 2023-05-12 10:05:12 +0000
+++ new/src/com/goldencode/artifacts/ExplicitFileList.java 2025-05-09 07:59:16 +0000
@@ -14,7 +14,9 @@
** 005 CA 20200116 Javadoc fixes.
** 006 CA 20220412 Added file-set support (either -Z command-line option or p2j.cfg.xml configuration).
** 007 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
+** 008 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -68,7 +70,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.util;
+package com.goldencode.artifacts;
import com.goldencode.p2j.util.logging.*;
=== renamed file 'src/com/goldencode/p2j/util/FileList.java' => 'src/com/goldencode/artifacts/FileList.java'
--- old/src/com/goldencode/p2j/util/FileList.java 2025-04-11 07:50:19 +0000
+++ new/src/com/goldencode/artifacts/FileList.java 2025-05-09 07:59:16 +0000
@@ -20,6 +20,7 @@
** CA 20220412 Added file-set support (either -Z command-line option or p2j.cfg.xml
** configuration).
** 010 ES 20250328 Added addAdditionalFiles and removeFiles methods to add/remove specific files.
+** 011 GES 20230524 Moved packages to be more generic.
*/
/*
@@ -75,7 +76,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.util;
+package com.goldencode.artifacts;
import java.io.*;
import java.util.*;
=== renamed file 'src/com/goldencode/p2j/util/FileListFactory.java' => 'src/com/goldencode/artifacts/FileListFactory.java'
--- old/src/com/goldencode/p2j/util/FileListFactory.java 2023-05-12 10:05:12 +0000
+++ new/src/com/goldencode/artifacts/FileListFactory.java 2025-05-09 07:59:16 +0000
@@ -9,6 +9,7 @@
** GES 20220323 Added explicit whitelist helper and moved common file name handling code here.
** CA 20220412 Added file-set support (either -Z command-line option or p2j.cfg.xml configuration).
** 002 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
+** 003 GES 20230524 Moved packages to be more generic.
*/
/*
@@ -65,7 +66,7 @@
*/
-package com.goldencode.p2j.util;
+package com.goldencode.artifacts;
import java.io.*;
import java.nio.file.*;
@@ -75,7 +76,6 @@
import com.goldencode.p2j.cfg.*;
import com.goldencode.p2j.convert.*;
-import com.goldencode.p2j.util.logging.*;
import com.goldencode.util.*;
/**
=== renamed file 'src/com/goldencode/p2j/cfg/FileReference.java' => 'src/com/goldencode/artifacts/FileReference.java'
--- old/src/com/goldencode/p2j/cfg/FileReference.java 2022-04-13 12:20:41 +0000
+++ new/src/com/goldencode/artifacts/FileReference.java 2025-05-09 07:59:16 +0000
@@ -2,11 +2,13 @@
** Module : FileReference.java
** Abstract : For a file-set configuration, this represents a file reference.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -60,7 +62,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
/**
* For a file-set configuration, this represents a file reference.
=== renamed file 'src/com/goldencode/p2j/cfg/FileSet.java' => 'src/com/goldencode/artifacts/FileSet.java'
--- old/src/com/goldencode/p2j/cfg/FileSet.java 2022-05-01 15:40:07 +0000
+++ new/src/com/goldencode/artifacts/FileSet.java 2025-05-09 07:59:16 +0000
@@ -2,12 +2,14 @@
** Module : FileSet.java
** Abstract : The configuration to load the file-list from a file-set.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
** CA 20220501 Added copy constructor.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -61,7 +63,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
import java.util.*;
=== renamed file 'src/com/goldencode/p2j/util/FileSpecList.java' => 'src/com/goldencode/artifacts/FileSpecList.java'
--- old/src/com/goldencode/p2j/util/FileSpecList.java 2023-05-24 22:36:08 +0000
+++ new/src/com/goldencode/artifacts/FileSpecList.java 2025-05-09 07:59:16 +0000
@@ -23,6 +23,7 @@
** 008 CA 20220412 Added file-set support (either -Z command-line option or p2j.cfg.xml configuration).
** 009 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
** 010 OM 20230510 Allow unverified directories to be set as [startDir] in import mode.
+** 011 GES 20230524 Moved packages to be more generic.
*/
/*
@@ -78,7 +79,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.util;
+package com.goldencode.artifacts;
import java.io.*;
import java.util.*;
=== renamed file 'src/com/goldencode/p2j/cfg/FilterOperation.java' => 'src/com/goldencode/artifacts/FilterOperation.java'
--- old/src/com/goldencode/p2j/cfg/FilterOperation.java 2022-04-16 18:38:24 +0000
+++ new/src/com/goldencode/artifacts/FilterOperation.java 2025-05-09 07:59:16 +0000
@@ -2,11 +2,13 @@
** Module : FileOperation.java
** Abstract : For a file-set configuration, this is the base class for Include or eXclude operations.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -60,7 +62,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
/**
* When a configuration is read from a {@link FileSet}, this represents the base class for Include or eXclude
=== renamed file 'src/com/goldencode/p2j/cfg/IncludeFilter.java' => 'src/com/goldencode/artifacts/IncludeFilter.java'
--- old/src/com/goldencode/p2j/cfg/IncludeFilter.java 2022-04-16 18:38:24 +0000
+++ new/src/com/goldencode/artifacts/IncludeFilter.java 2025-05-09 07:59:16 +0000
@@ -2,11 +2,13 @@
** Module : IncludeFilter.java
** Abstract : For a file-set configuration, this represents the Include operation.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -60,7 +62,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
/**
* When a configuration is read from a {@link FileSet}, this represents the Include operation, when a set of
=== added file 'src/com/goldencode/artifacts/IntermediateArtifact.java'
--- old/src/com/goldencode/artifacts/IntermediateArtifact.java 1970-01-01 00:00:00 +0000
+++ new/src/com/goldencode/artifacts/IntermediateArtifact.java 2025-05-09 07:59:16 +0000
@@ -0,0 +1,87 @@
+/*
+** Module : IntermediateArtifact.java
+** Abstract : Represents a single intermediate artifact in a project.
+**
+** Copyright (c) 2025, Golden Code Development Corporation.
+**
+** -#- -I- --Date-- --------------------------------Description----------------------------------
+** 001 DDF 20250228 Created initial version.
+** DDF 20250320 Modified the constructor.
+*/
+
+/*
+** This program is free software: you can redistribute it and/or modify
+** it under the terms of the GNU Affero General Public License as
+** published by the Free Software Foundation, either version 3 of the
+** License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU Affero General Public License for more details.
+**
+** You may find a copy of the GNU Affero GPL version 3 at the following
+** location: https://www.gnu.org/licenses/agpl-3.0.en.html
+**
+** Additional terms under GNU Affero GPL version 3 section 7:
+**
+** Under Section 7 of the GNU Affero GPL version 3, the following additional
+** terms apply to the works covered under the License. These additional terms
+** are non-permissive additional terms allowed under Section 7 of the GNU
+** Affero GPL version 3 and may not be removed by you.
+**
+** 0. Attribution Requirement.
+**
+** You must preserve all legal notices or author attributions in the covered
+** work or Appropriate Legal Notices displayed by works containing the covered
+** work. You may not remove from the covered work any author or developer
+** credit already included within the covered work.
+**
+** 1. No License To Use Trademarks.
+**
+** This license does not grant any license or rights to use the trademarks
+** Golden Code, FWD, any Golden Code or FWD logo, or any other trademarks
+** of Golden Code Development Corporation. You are not authorized to use the
+** name Golden Code, FWD, or the names of any author or contributor, for
+** publicity purposes without written authorization.
+**
+** 2. No Misrepresentation of Affiliation.
+**
+** You may not represent yourself as Golden Code Development Corporation or FWD.
+**
+** You may not represent yourself for publicity purposes as associated with
+** Golden Code Development Corporation, FWD, or any author or contributor to
+** the covered work, without written authorization.
+**
+** 3. No Misrepresentation of Source or Origin.
+**
+** You may not represent the covered work as solely your work. All modified
+** versions of the covered work must be marked in a reasonable way to make it
+** clear that the modified work is not originating from Golden Code Development
+** Corporation or FWD. All modified versions must contain the notices of
+** attribution required in this license.
+*/
+
+package com.goldencode.artifacts;
+
+/**
+ * Represents a single intermediate artifact in a project.
+ */
+public class IntermediateArtifact
+extends BaseArtifact
+{
+ /**
+ * Basic constructor.
+ *
+ * @param id
+ * The id of the artifact.
+ * @param relativePath
+ * The filename relative path name of the artifact.
+ * @param absolutePath
+ * The filename absolute path name of the artifact.
+ */
+ public IntermediateArtifact(Long id, String relativePath, String absolutePath)
+ {
+ super(id, relativePath, absolutePath);
+ }
+}
=== added file 'src/com/goldencode/artifacts/OutputArtifact.java'
--- old/src/com/goldencode/artifacts/OutputArtifact.java 1970-01-01 00:00:00 +0000
+++ new/src/com/goldencode/artifacts/OutputArtifact.java 2025-05-09 07:59:16 +0000
@@ -0,0 +1,87 @@
+/*
+** Module : OutputArtifact.java
+** Abstract : Represents a single output artifact in a project.
+**
+** Copyright (c) 2025, Golden Code Development Corporation.
+**
+** -#- -I- --Date-- --------------------------------Description----------------------------------
+** 001 DDF 20250228 Created initial version.
+** DDF 20250320 Modified the constructor.
+*/
+
+/*
+** This program is free software: you can redistribute it and/or modify
+** it under the terms of the GNU Affero General Public License as
+** published by the Free Software Foundation, either version 3 of the
+** License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU Affero General Public License for more details.
+**
+** You may find a copy of the GNU Affero GPL version 3 at the following
+** location: https://www.gnu.org/licenses/agpl-3.0.en.html
+**
+** Additional terms under GNU Affero GPL version 3 section 7:
+**
+** Under Section 7 of the GNU Affero GPL version 3, the following additional
+** terms apply to the works covered under the License. These additional terms
+** are non-permissive additional terms allowed under Section 7 of the GNU
+** Affero GPL version 3 and may not be removed by you.
+**
+** 0. Attribution Requirement.
+**
+** You must preserve all legal notices or author attributions in the covered
+** work or Appropriate Legal Notices displayed by works containing the covered
+** work. You may not remove from the covered work any author or developer
+** credit already included within the covered work.
+**
+** 1. No License To Use Trademarks.
+**
+** This license does not grant any license or rights to use the trademarks
+** Golden Code, FWD, any Golden Code or FWD logo, or any other trademarks
+** of Golden Code Development Corporation. You are not authorized to use the
+** name Golden Code, FWD, or the names of any author or contributor, for
+** publicity purposes without written authorization.
+**
+** 2. No Misrepresentation of Affiliation.
+**
+** You may not represent yourself as Golden Code Development Corporation or FWD.
+**
+** You may not represent yourself for publicity purposes as associated with
+** Golden Code Development Corporation, FWD, or any author or contributor to
+** the covered work, without written authorization.
+**
+** 3. No Misrepresentation of Source or Origin.
+**
+** You may not represent the covered work as solely your work. All modified
+** versions of the covered work must be marked in a reasonable way to make it
+** clear that the modified work is not originating from Golden Code Development
+** Corporation or FWD. All modified versions must contain the notices of
+** attribution required in this license.
+*/
+
+package com.goldencode.artifacts;
+
+/**
+ * Represents a single output artifact in a project.
+ */
+public class OutputArtifact
+extends BaseArtifact
+{
+ /**
+ * Basic constructor.
+ *
+ * @param id
+ * The id of the artifact.
+ * @param relativePath
+ * The filename relative path name of the artifact.
+ * @param absolutePath
+ * The filename absolute path name of the artifact.
+ */
+ public OutputArtifact(Long id, String relativePath, String absolutePath)
+ {
+ super(id, relativePath, absolutePath);
+ }
+}
=== renamed file 'src/com/goldencode/p2j/cfg/PathReference.java' => 'src/com/goldencode/artifacts/PathReference.java'
--- old/src/com/goldencode/p2j/cfg/PathReference.java 2022-04-13 12:20:41 +0000
+++ new/src/com/goldencode/artifacts/PathReference.java 2025-05-09 07:59:16 +0000
@@ -2,11 +2,13 @@
** Module : PathReference.java
** Abstract : For a file-set configuration, this represents the base class for a directory or file reference.
**
-** Copyright (c) 2022, Golden Code Development Corporation.
+** Copyright (c) 2022-2023, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------------Description----------------------------------------
** 001 CA 20220412 Created initial version.
+** 002 GES 20230524 Moved packages to be more generic.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -60,7 +62,7 @@
** attribution required in this license.
*/
-package com.goldencode.p2j.cfg;
+package com.goldencode.artifacts;
/**
* For a file-set configuration, this represents the base class for a directory or file reference.
=== added file 'src/com/goldencode/artifacts/SourceArtifact.java'
--- old/src/com/goldencode/artifacts/SourceArtifact.java 1970-01-01 00:00:00 +0000
+++ new/src/com/goldencode/artifacts/SourceArtifact.java 2025-05-09 07:59:16 +0000
@@ -0,0 +1,117 @@
+/*
+** Module : SourceArtifact.java
+** Abstract : represents an artifact which is an input in a project
+**
+** Copyright (c) 2023-2025, Golden Code Development Corporation.
+**
+** -#- -I- --Date-- --------------------------------Description----------------------------------
+** 001 GES 20230506 First version.
+** DDF 20250228 Added constructor.
+** DDF 20250320 Modified the constructor.
+** DDF 20250407 Added reader property.
+*/
+
+/*
+** This program is free software: you can redistribute it and/or modify
+** it under the terms of the GNU Affero General Public License as
+** published by the Free Software Foundation, either version 3 of the
+** License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU Affero General Public License for more details.
+**
+** You may find a copy of the GNU Affero GPL version 3 at the following
+** location: https://www.gnu.org/licenses/agpl-3.0.en.html
+**
+** Additional terms under GNU Affero GPL version 3 section 7:
+**
+** Under Section 7 of the GNU Affero GPL version 3, the following additional
+** terms apply to the works covered under the License. These additional terms
+** are non-permissive additional terms allowed under Section 7 of the GNU
+** Affero GPL version 3 and may not be removed by you.
+**
+** 0. Attribution Requirement.
+**
+** You must preserve all legal notices or author attributions in the covered
+** work or Appropriate Legal Notices displayed by works containing the covered
+** work. You may not remove from the covered work any author or developer
+** credit already included within the covered work.
+**
+** 1. No License To Use Trademarks.
+**
+** This license does not grant any license or rights to use the trademarks
+** Golden Code, FWD, any Golden Code or FWD logo, or any other trademarks
+** of Golden Code Development Corporation. You are not authorized to use the
+** name Golden Code, FWD, or the names of any author or contributor, for
+** publicity purposes without written authorization.
+**
+** 2. No Misrepresentation of Affiliation.
+**
+** You may not represent yourself as Golden Code Development Corporation or FWD.
+**
+** You may not represent yourself for publicity purposes as associated with
+** Golden Code Development Corporation, FWD, or any author or contributor to
+** the covered work, without written authorization.
+**
+** 3. No Misrepresentation of Source or Origin.
+**
+** You may not represent the covered work as solely your work. All modified
+** versions of the covered work must be marked in a reasonable way to make it
+** clear that the modified work is not originating from Golden Code Development
+** Corporation or FWD. All modified versions must contain the notices of
+** attribution required in this license.
+*/
+
+package com.goldencode.artifacts;
+
+import java.io.*;
+
+/**
+ * Represents an artifact which is an input in a project. Source artifacts can be code, data, configuration
+ * or any other input which is provided to the project externally. This means it may be modified externally,
+ * and it should not be deleted or modified by any tools operating on the project.
+ */
+public class SourceArtifact
+extends BaseArtifact
+{
+ /** Character stream for the backing file of the artifact. */
+ private Reader reader;
+
+ /**
+ * Basic constructor.
+ *
+ * @param id
+ * The id of the artifact.
+ * @param relativePath
+ * The filename relative path name of the artifact.
+ * @param absolutePath
+ * The filename absolute path name of the artifact.
+ */
+ public SourceArtifact(Long id, String relativePath, String absolutePath)
+ {
+ super(id, relativePath, absolutePath);
+ }
+
+ /**
+ * Get the character stream for the backing file of the artifact.
+ *
+ * @return The character stream.
+ */
+ public Reader getReader()
+ {
+ return reader;
+ }
+
+ /**
+ * Set the character stream for the backing file of the artifact.
+ *
+ * @param reader
+ * The reader.
+ */
+ public void setReader(Reader reader)
+ {
+ this.reader = reader;
+ }
+}
=== modified file 'src/com/goldencode/ast/Aast.java'
--- old/src/com/goldencode/ast/Aast.java 2024-08-12 06:53:50 +0000
+++ new/src/com/goldencode/ast/Aast.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : Aast.java
** Abstract : extension of AST interface to support post-processing features
**
-** Copyright (c) 2005-2024, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 ECF 20050218 @19888 Created initial version.
@@ -112,6 +112,9 @@
** 058 CA 20240324 Performance improvement for runtime annotations: are stored using an integer
** instead of string.
** 059 CA 20240812 Small improvement for 'getImmediateChild' - initialize the set size.
+** 060 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250423 Added getFilename() back temporarily.
+** DDF 20250423 Removed getFilename() after removing its usage from TRPL.
*/
/*
@@ -170,6 +173,8 @@
package com.goldencode.ast;
import antlr.collections.AST;
+import com.goldencode.artifacts.Artifact;
+
import java.util.*;
/**
@@ -396,22 +401,22 @@
public void clearIds();
/**
- * Clear all IDs of an AST and register it under a new filename. The
+ * Clear all IDs of an AST and register it under a new artifact. The
* AST is walked to fix-up all parent-child relationships as part of
* the re-initialization.
* null if no name has yet
+ * @return Artifact of source file, or null if no artifact has yet
* been assigned.
*/
- public String getFilename();
+ public Artifact getArtifact();
/**
* Return a string representing the path of this AST from the root AST,
=== modified file 'src/com/goldencode/ast/AnnotatedAst.java'
--- old/src/com/goldencode/ast/AnnotatedAst.java 2024-04-23 08:14:30 +0000
+++ new/src/com/goldencode/ast/AnnotatedAst.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : AnnotatedAst.java
** Abstract : an AST which supports annotations and other features needed for post-processing
**
-** Copyright (c) 2005-2024, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 ECF 20050218 @19889 Created initial version.
@@ -234,6 +234,10 @@
** 095 CA 20240324 Performance improvement for runtime annotations: are stored using an integer
** instead of string.
** 096 CA 20240423 Always store annotations as their lowercase counterpart.
+** 097 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250423 Added getFilename() back temporarily.
+** DDF 20250423 Removed getFilename() after removing its usage from TRPL.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
/*
@@ -299,6 +303,7 @@
import antlr.*;
import antlr.collections.*;
+import com.goldencode.artifacts.Artifact;
import com.goldencode.p2j.cfg.Configuration;
import com.goldencode.p2j.convert.*;
import com.goldencode.p2j.pattern.*;
@@ -994,43 +999,43 @@
}
/**
- * Clear all IDs of an AST and register it under a new filename. The
+ * Clear all IDs of an AST and register it under a new artifact. The
* AST is walked to fix-up all parent-child relationships as part of
* the re-initialization.
* true to create shadow nodes from hidden tokens.
* false to drop hidden tokens without creating any
@@ -1039,13 +1044,13 @@
* @throws AstException
* if any error occurs registering AST or applying fixups.
*/
- public void brainwash(String filename, boolean shadow)
+ public void brainwash(Artifact artifact, boolean shadow)
throws AstException
{
this.clearIds();
AstManager mgr = AstManager.get();
- Long id = mgr.addTree(filename);
+ Long id = mgr.addTree(artifact);
mgr.resetNextNodeId(id);
this.fixups(null, id, shadow);
@@ -2880,20 +2885,20 @@
}
/**
- * Get source code filename associated with the current node. This
+ * Get source code artifact associated with the current node. This
* information is retrieved from the {@link AstManager} by this AST's
* ID.
*
- * @return Source code filename associated with this AST or
+ * @return Source code artifact associated with this AST or
* null if the ID is null or invalid.
*/
- public String getFilename()
+ public Artifact getArtifact()
{
if (id != null)
{
try
{
- return AstManager.get().getTreeName(id);
+ return AstManager.get().getTreeArtifact(id);
}
catch (AstException ae)
{
=== modified file 'src/com/goldencode/ast/AstManager.java'
--- old/src/com/goldencode/ast/AstManager.java 2024-11-18 11:40:06 +0000
+++ new/src/com/goldencode/ast/AstManager.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : AstManager.java
** Abstract : provides services for creating, deleting, editing and using ASTs
**
-** Copyright (c) 2009-2024, Golden Code Development Corporation.
+** Copyright (c) 2009-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 GES 20090430 @42198 Created initial version. This singleton class provides services for creating,
@@ -17,6 +17,11 @@
** InMemoryRegistryPlugin is not thread-safe.
** CA 20211216 initialize(Supplier) returns the AstManager instance.
** 007 GES 20241112 Added rewriteTreeName() to fix the data structures for changed filenames.
+** 008 DDF 20250407 Integrated the static block from ScanDriver.
+** DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
+** DDF 20250430 Removed the static block because import fails due to XmlFilePlugin, which is
+** initialized too early.
*/
/*
@@ -76,6 +81,8 @@
import java.util.function.*;
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.p2j.cfg.Configuration;
import com.goldencode.p2j.security.*;
/**
@@ -111,7 +118,7 @@
* the same tree.
* null ID. Similarly, a tree ID (which by definition has a
+ * null ID. Similarly, a tree ID (which by definition has
* a lower DWORD of 0x00000000) can never refer to a specific node and only
* refers to a tree (to the entire tree rather than any given node of that
* tree).
@@ -119,7 +126,7 @@
* This class provides the assignment facility for obtaining unique tree IDs
* as well as unique node IDs (see {@link #getNextNodeId}).
* null if no
+ * @return The artifact associated with the tree or null if no
* such tree ID exists.
*/
- public String getTreeName(long id)
+ public Artifact getTreeArtifact(long id)
{
- return getPlugin().getTreeName(id);
+ return getPlugin().getTreeArtifact(id);
}
/**
- * Reverse lookup of the ID that corresponds to a given AST name.
- *
- * @param name
- * Tree name whose unique ID should be returned.
- *
- * @return The tree ID associated with the name or
- * {@link AstManager#INVALID_ID} if the tree name doesn't exist or
+ * Reverse lookup of the ID that corresponds to a given AST artifact.
+ *
+ * @param artifact
+ * Tree artifact whose unique ID should be returned.
+ *
+ * @return The tree ID associated with the artifact or
+ * {@link AstManager#INVALID_ID} if the tree artifact doesn't exist or
* if it is null.
*/
- public long getTreeId(String name)
+ public long getTreeId(Artifact artifact)
{
- return getPlugin().getTreeId(name);
+ return getPlugin().getTreeId(artifact);
}
/**
@@ -306,63 +313,63 @@
}
/**
- * Load a named AST from persistent storage.
+ * Load an artifact AST from persistent storage.
*
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree.
*
* @return The loaded AST.
*
* @throws AstException
* On any error during the loading process.
* @throws IllegalArgumentException
- * If the name is invalid or the specified resource doesn't exist.
+ * If the artifact is invalid or the specified resource doesn't exist.
*/
- public Aast loadTree(String name)
+ public Aast loadTree(Artifact artifact)
throws AstException,
IllegalArgumentException
{
- return getPlugin().loadTree(name);
+ return getPlugin().loadTree(artifact);
}
/**
- * Check if the AST specified by the given name exists already in the plugin's storage.
+ * Check if the AST specified by the given artifact exists already in the plugin's storage.
*
- * @param name
- * The name (including path) of the AST file to be checked.
+ * @param artifact
+ * The artifact (including path) of the AST file to be checked.
*
* @return true if the specified AST is in the plugin's storage.
*/
- public boolean isExistingAst(String name)
+ public boolean isExistingAst(Artifact artifact)
{
- return getPlugin().isExistingAst(name);
+ return getPlugin().isExistingAst(artifact);
}
/**
- * Save the given AST to persistent storage under the given name.
+ * Save the given AST to persistent storage under the given artifact.
*
* @param ast
* The tree to save.
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree.
* @param terse
* Do not store line and column data when the node data is saved.
*
* @throws AstException
* On any error during the saving process.
* @throws IllegalArgumentException
- * If the name is invalid or the specified resource cannot be
+ * If the artifact is invalid or the specified resource cannot be
* used as a target to store the AST.
*/
- public void saveTree(Aast ast, String name, boolean terse)
+ public void saveTree(Aast ast, Artifact artifact, boolean terse)
throws AstException,
IllegalArgumentException
{
- getPlugin().saveTree(ast, name, terse);
+ getPlugin().saveTree(ast, artifact, terse);
}
/**
- * Obtains a process-wide lock on any processing related to the given tree name. If the lock is already
+ * Obtains a process-wide lock on any processing related to the given tree artifact. If the lock is already
* held, this method will block until it obtains the lock. When this method returns normally, the calling
* thread is guaranteed to be holding the lock. This may be called recursively by the same thread and if
* the current thread is already holding the lock, then this method will only update the reference count
@@ -374,9 +381,9 @@
* lock. Rather, this lock is a cooperative agreement between all callers (within the same JVM) that no use
* of the given tree will be made except when the caller holds this exclusive lock to the resource.
*
- * @param name
- * Tree name that is associated with the lock. This must be a valid tree name which can be used
- * to uniquely identify the tree to be locked.
+ * @param artifact
+ * Tree artifact that is associated with the lock. This must be a valid tree artifact which
+ * can be used to uniquely identify the tree to be locked.
* @param orig
* {@code true} means the file is part of the original set of files to be converted. Otherwise,
* the file is loaded indirectly by pre-scanning a procedure or other class.
@@ -385,18 +392,18 @@
* When an interruption occurs during blocking for the lock. If this is thrown, the caller will
* NOT be holding the lock.
* @throws IllegalArgumentException
- * If the name does not represent a valid tree.
+ * If the artifact does not represent a valid tree.
*/
- public void lockTree(String name, boolean orig)
+ public void lockTree(Artifact artifact, boolean orig)
throws InterruptedException,
IllegalArgumentException
{
- long id = getTreeId(name);
+ long id = getTreeId(artifact);
if (id == INVALID_ID)
{
// tree doesn't yet exist, create it
- id = addTree(name);
+ id = addTree(artifact);
if (orig)
{
// mark this as an original file
@@ -457,9 +464,9 @@
* given tree will be made except when the caller holds this exclusive lock
* to the resource.
*
- * @param name
- * Tree name that is associated with the lock. This must be a
- * valid tree name which can be used to uniquely identify the
+ * @param artifact
+ * Tree artifact that is associated with the lock. This must be a
+ * valid tree artifact which can be used to uniquely identify the
* tree to be locked.
*
* @throws IllegalMonitorStateException
@@ -467,11 +474,11 @@
* @throws IllegalArgumentException
* If the name does not represent a valid tree.
*/
- public void unlockTree(String name)
+ public void unlockTree(Artifact artifact)
throws IllegalMonitorStateException,
IllegalArgumentException
{
- unlockTree(getTreeId(name));
+ unlockTree(getTreeId(artifact));
}
/**
@@ -506,16 +513,16 @@
}
/**
- * Fixup the data structures to reference a different name.
+ * Fixup the data structures to reference a different artifact.
*
- * @param oldname
- * File name currently in the data structures.
- * @param newname
- * Name to be inserted into the data structures.
+ * @param oldArtifact
+ * Artifact currently in the data structures.
+ * @param newArtifact
+ * Artifact to be inserted into the data structures.
*/
- public void rewriteTreeName(String oldname, String newname)
+ public void rewriteTreeArtifact(Artifact oldArtifact, Artifact newArtifact)
{
- getPlugin().rewriteTreeName(oldname, newname);
+ getPlugin().rewriteTreeArtifact(oldArtifact, newArtifact);
}
/**
@@ -564,19 +571,19 @@
* tree ID is assigned and this mapping is added to the registry. If the
* tree name already exists, the existing tree ID is returned.
*
- * @param name
- * The tree name. Often this will be the name of a file.
+ * @param artifact
+ * The tree artifact.
*
* @return The assigned tree ID.
*
* @throws AstException
* If too many ASTs exist in the registry or if the input
- * name is null.
+ * artifact is null.
*/
- public long addTree(String name)
+ public long addTree(Artifact artifact)
throws AstException
{
- return getPlugin().addTree(name);
+ return getPlugin().addTree(artifact);
}
/**
@@ -597,16 +604,16 @@
/**
* Removes all mapping data referencing the specified tree.
*
- * @param name
- * The tree name to remove.
+ * @param artifact
+ * The tree artifact to remove.
*
* @return true if the tree existed in the registry (and
* was removed), false if the tree didn't exist.
*/
- public boolean removeTree(String name)
+ public boolean removeTree(Artifact artifact)
throws AstException
{
- return getPlugin().removeTree(getTreeId(name));
+ return getPlugin().removeTree(getTreeId(artifact));
}
/**
@@ -648,7 +655,7 @@
}
/**
- * Get the AST manager plugin for this current context. If it is not yet set, it will be assigned to a
+ * Get the AST manager plugin for this current context. If it is not yet set, it will be assigned to an
* instance returned by the {@link #creator supplier}.
*
* @return See above.
=== modified file 'src/com/goldencode/ast/AstManagerPlugin.java'
--- old/src/com/goldencode/ast/AstManagerPlugin.java 2024-11-18 11:40:06 +0000
+++ new/src/com/goldencode/ast/AstManagerPlugin.java 2025-05-09 07:59:16 +0000
@@ -3,7 +3,7 @@
** Abstract : defines the API for an AstManager plugin that implements services
** for creating, deleting, editing and using ASTs
**
-** Copyright (c) 2009-2024, Golden Code Development Corporation.
+** Copyright (c) 2009-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 GES 20090430 @42199 Created initial version. This defines the API for an AstManager plugin that
@@ -16,6 +16,8 @@
** IAS 20211028 Added conversion of a DOM node to a formatted string (for debugging).
** ECF 20211108 Format cleanup.
** 007 GES 20241112 Added rewriteTreeName() to fix the data structures for changed filenames.
+** 008 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
/*
@@ -77,7 +79,10 @@
import javax.xml.transform.*;
import javax.xml.transform.dom.*;
import javax.xml.transform.stream.*;
+
+import com.goldencode.artifacts.Artifact;
import org.w3c.dom.*;
+
/**
* This defines the API for an {@link AstManager} plugin that implements
* services for creating, deleting, editing and using Abstract Syntax Trees
@@ -138,7 +143,7 @@
public boolean usesMemoryStorage();
/**
- * Lookup the name associated with the tree specified by this ID. The ID can
+ * Lookup the artifact associated with the tree specified by this ID. The ID can
* be a tree ID (an ID that represents an entire AST) or it can be the ID
* an individual AST node ID. Node IDs encode the tree ID and a portion that
* is node-specific. The node-specific portion will be ignored.
@@ -147,20 +152,20 @@
* The ID to use as a key in the lookup. This ID may be a tree ID
* or a specific node ID.
*
- * @return The name associated with the tree or {@code null} if no such tree ID exists.
+ * @return The artifact associated with the tree or {@code null} if no such tree ID exists.
*/
- public String getTreeName(long id);
+ public Artifact getTreeArtifact(long id);
/**
- * Reverse lookup of the ID that corresponds to a given AST name.
- *
- * @param name
- * Tree name whose unique ID should be returned.
- *
- * @return The tree ID associated with the name or {@link AstManager#INVALID_ID} if the tree name doesn't
- * exist or if it is {@code null}.
+ * Reverse lookup of the ID that corresponds to a given AST artifact.
+ *
+ * @param artifact
+ * Tree artifact whose unique ID should be returned.
+ *
+ * @return The tree ID associated with the artifact or {@link AstManager#INVALID_ID} if the tree
+ * artifact doesn't exist or if it is {@code null}.
*/
- public long getTreeId(String name);
+ public long getTreeId(Artifact artifact);
/**
* Returns the tree ID portion of a node ID.
@@ -174,10 +179,10 @@
public long getTreeId(long id);
/**
- * Load a named AST from persistent storage.
+ * Load an artifact AST from persistent storage.
*
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree.
*
* @return The loaded AST.
*
@@ -186,17 +191,17 @@
* @throws IllegalArgumentException
* If the name is invalid or the specified resource doesn't exist.
*/
- public Aast loadTree(String name)
+ public Aast loadTree(Artifact artifact)
throws AstException,
IllegalArgumentException;
/**
- * Save the given AST to persistent storage under the given name.
+ * Save the given AST to persistent storage under the given artifact.
*
* @param ast
* The tree to save.
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree. Often this is a file artifact.
* @param terse
* Do not store line and column data when the node data is saved.
*
@@ -205,7 +210,7 @@
* @throws IllegalArgumentException
* If the name is invalid or the specified resource cannot be used as a target to store the AST.
*/
- public void saveTree(Aast ast, String name, boolean terse)
+ public void saveTree(Aast ast, Artifact artifact, boolean terse)
throws AstException,
IllegalArgumentException;
@@ -308,15 +313,15 @@
* tree ID is assigned and this mapping is added to the registry. If the
* tree name already exists, the existing tree ID is returned.
*
- * @param name
- * The tree name. Often this will be the name of a file.
+ * @param artifact
+ * The tree artifact.
*
* @return The assigned tree ID.
*
* @throws AstException
- * If too many ASTs exist in the registry or if the input name is {@code null}.
+ * If too many ASTs exist in the registry or if the input artifact is {@code null}.
*/
- public long addTree(String name)
+ public long addTree(Artifact artifact)
throws AstException;
/**
@@ -341,24 +346,24 @@
throws AstException;
/**
- * Check if the AST specified by the given name exists already in the plugin's storage.
+ * Check if the AST specified by the given artifact exists already in the plugin's storage.
*
- * @param name
- * The name (including path) of the AST file to be checked.
+ * @param artifact
+ * The artifact (including path) of the AST file to be checked.
*
* @return {@code true} if the specified AST is in the plugin's storage.
*/
- public boolean isExistingAst(String name);
+ public boolean isExistingAst(Artifact artifact);
/**
- * Fixup the data structures to reference a different name.
+ * Fixup the data structures to reference a different artifact.
*
- * @param oldname
- * File name currently in the data structures.
- * @param newname
- * Name to be inserted into the data structures.
+ * @param oldArtifact
+ * Artifact currently in the data structures.
+ * @param newArtifact
+ * Artifact to be inserted into the data structures.
*/
- public void rewriteTreeName(String oldname, String newname);
+ public void rewriteTreeArtifact(Artifact oldArtifact, Artifact newArtifact);
/**
* Sets a flag (or a {@code or} combination of them) for a specific tree.
=== modified file 'src/com/goldencode/ast/BasePlugin.java'
--- old/src/com/goldencode/ast/BasePlugin.java 2024-11-18 11:40:06 +0000
+++ new/src/com/goldencode/ast/BasePlugin.java 2025-05-09 07:59:16 +0000
@@ -3,7 +3,7 @@
** Abstract : maintains a project-specific master bidirectional indexing
** facility for tree names to unique IDs
**
-** Copyright (c) 2005-2024, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 GES 20090513 @42200 Refactored code from AstRegistry to implement the first version.
@@ -11,6 +11,8 @@
** 003 OM 20210913 Added optional flags capability to stored AST nodes and API to query a list of
** ASTs based on their flags.
** 004 GES 20241112 Added rewriteTreeName() to fix the data structures for changed filenames.
+** 005 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
/*
@@ -68,6 +70,8 @@
package com.goldencode.ast;
+import com.goldencode.artifacts.Artifact;
+
import java.util.*;
import java.util.concurrent.locks.*;
@@ -87,10 +91,10 @@
/** Specifies the maximum possible number of files in the registry. */
protected static final long MAX_POSSIBLE = Integer.MAX_VALUE;
- /** Stores the tree name to ID mapping information. */
- protected Mapnull if no
+ * @return The artifact associated with the tree or null if no
* such tree ID exists.
*/
- public String getTreeName(long id)
+ public Artifact getTreeArtifact(long id)
{
Pair pair = null;
- String name = null;
+ Artifact artifact = null;
if (id != AstManager.INVALID_ID)
{
@@ -136,61 +140,61 @@
if (pair != null)
{
- name = pair.name;
+ artifact = pair.artifact;
}
}
}
- return name;
+ return artifact;
}
/**
- * Fixup the data structures to reference a different name.
+ * Fixup the data structures to reference a different artifact.
*
- * @param oldname
- * File name currently in the data structures.
- * @param newname
- * Name to be inserted into the data structures.
+ * @param oldArtifact
+ * Artifact currently in the data structures.
+ * @param newArtifact
+ * Artifact to be inserted into the data structures.
*/
- public void rewriteTreeName(String oldname, String newname)
+ public void rewriteTreeArtifact(Artifact oldArtifact, Artifact newArtifact)
{
synchronized (this)
{
- Long id = fnames.remove(oldname);
+ Long id = fnames.remove(oldArtifact);
if (id != AstManager.INVALID_ID)
{
- fnames.put(newname, id);
+ fnames.put(newArtifact, id);
Pair pair = fids.get(id);
if (pair != null)
{
- pair.name = newname;
+ pair.artifact = newArtifact;
}
}
}
}
/**
- * Reverse lookup of the ID that corresponds to a given AST name.
- *
- * @param name
- * Tree name whose unique ID should be returned.
- *
- * @return The tree ID associated with the name or
- * {@link AstManager#INVALID_ID} if the tree name doesn't exist or
+ * Reverse lookup of the ID that corresponds to a given AST artifact.
+ *
+ * @param artifact
+ * Tree artifact whose unique ID should be returned.
+ *
+ * @return The tree ID associated with the artifact or
+ * {@link AstManager#INVALID_ID} if the tree artifact doesn't exist or
* is null.
*/
- public long getTreeId(String name)
+ public long getTreeId(Artifact artifact)
{
long id = AstManager.INVALID_ID;
- if (name != null)
+ if (artifact != null)
{
synchronized (this)
{
- Long possible = fnames.get(name);
+ Long possible = fnames.get(artifact);
if (possible != null)
{
@@ -394,26 +398,26 @@
/**
* Adds a mapping from the specified AST to a new ID. The next available
* tree ID is assigned and this mapping is added to the registry. If the
- * tree name already exists, the existing tree ID is returned.
+ * tree artifact already exists, the existing tree ID is returned.
*
- * @param name
- * The tree name. Often this will be the name of a file.
+ * @param artifact
+ * The tree artifact.
*
* @return The assigned tree ID.
*
* @throws AstException
* If too many ASTs exist in the registry or if the input
- * name is null.
+ * artifact is null.
*/
- public long addTree(String name)
+ public long addTree(Artifact artifact)
throws AstException
{
- if (name == null)
+ if (artifact == null)
{
- throw new AstException("Cannot add null source name to the registry.");
+ throw new AstException("Cannot add null source artifact to the registry.");
}
- long result = getTreeId(name);
+ long result = getTreeId(artifact);
if (result == AstManager.INVALID_ID)
{
@@ -440,13 +444,13 @@
// node IDs to get the next possible file ID
result = possible << HIGH_BITS;
- } while (getTreeName(result) != null);
+ } while (getTreeArtifact(result) != null);
// the first node ID is stored in the next member of the inner class Pair, this value is set to
// the file ID + 1 which is the first unique AST node ID
- Pair newFile = new Pair(name, result + 1);
+ Pair newFile = new Pair(artifact, result + 1);
fids.put(result, newFile);
- fnames.put(name, result);
+ fnames.put(artifact, result);
// mark the registry as needing a save
dirty = true;
@@ -484,7 +488,7 @@
return false;
}
- fnames.remove(pair.name);
+ fnames.remove(pair.artifact);
fids.remove(id);
// mark the registry as needing a save
@@ -610,7 +614,7 @@
// check if all flags are set
if ((pair.flags & flags) == flags)
{
- gather[count++] = pair.name;
+ gather[count++] = pair.artifact.getRelativePath();
}
}
@@ -628,13 +632,13 @@
}
/**
- * Simple container class to store the next available ID for a tree, the associated tree name and whether
- * it was part of the original set of source files.
+ * Simple container class to store the next available ID for a tree, the associated tree artifact and
+ * whether it was part of the original set of source files.
*/
protected static class Pair
{
- /** A tree name. */
- protected String name;
+ /** A tree artifact. */
+ protected Artifact artifact;
/**
* Was this file marked in any way?
@@ -651,14 +655,14 @@
/**
* Default constructor.
*
- * @param name
- * A tree name.
+ * @param artifact
+ * A tree artifact.
* @param next
* The next available ID associated with this tree.
*/
- protected Pair(String name, long next)
+ protected Pair(Artifact artifact, long next)
{
- this.name = name;
+ this.artifact = artifact;
this.next = next;
}
}
=== modified file 'src/com/goldencode/ast/InMemoryRegistryPlugin.java'
--- old/src/com/goldencode/ast/InMemoryRegistryPlugin.java 2020-04-27 20:45:31 +0000
+++ new/src/com/goldencode/ast/InMemoryRegistryPlugin.java 2025-05-09 07:59:16 +0000
@@ -2,13 +2,16 @@
** Module : InMemoryRegistryPlugin.java
** Abstract : implements an in-memory AST storage option for an AstManagerPlugin
**
-** Copyright (c) 2013-2017, Golden Code Development Corporation.
+** Copyright (c) 2013-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------Description----------------------------------
** 001 CA 20131023 Created first version.
** 002 ECF 20140919 Fixed memory leaks, added usesMemoryStorage method, to help with memory
** management.
+** 003 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -64,6 +67,8 @@
package com.goldencode.ast;
+import com.goldencode.artifacts.Artifact;
+
import java.util.*;
/**
@@ -72,8 +77,8 @@
public class InMemoryRegistryPlugin
extends BasePlugin
{
- /** In-memory storage of ASTs, by their name. */
- private final Mapname as the key.
*
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree.
*
* @return The loaded AST.
*
* @throws AstException
* On any error during the loading process.
* @throws IllegalArgumentException
- * If the name is invalid or the specified resource doesn't exist.
+ * If the artifact is invalid or the specified resource doesn't exist.
*/
@Override
- public Aast loadTree(String name)
+ public Aast loadTree(Artifact artifact)
throws AstException,
IllegalArgumentException
{
- Aast ast = asts.get(name);
+ Aast ast = asts.get(artifact);
Aast clone = ast.duplicate();
clone.removeAnnotation("terse");
@@ -119,28 +124,28 @@
}
/**
- * Save the given AST to in-memory storage under the given name. This will save a copy of the
- * specified AST in the {@link #asts} map, usin the specified name as the key.
+ * Save the given AST to in-memory storage under the given artifact. This will save a copy of the
+ * specified AST in the {@link #asts} map, using the specified artifact as the key.
*
* @param ast
* The tree to save.
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree.
* @param terse
* Do not store line and column data when the node data is saved.
*
* @throws AstException
* On any error during the saving process.
* @throws IllegalArgumentException
- * If the name is invalid or the specified resource cannot be
+ * If the artifact is invalid or the specified resource cannot be
* used as a target to store the AST.
*/
@Override
- public void saveTree(Aast ast, String name, boolean terse)
+ public void saveTree(Aast ast, Artifact artifact, boolean terse)
throws AstException,
IllegalArgumentException
{
- addTree(name);
+ addTree(artifact);
Aast clone = ast.duplicate();
@@ -150,7 +155,7 @@
terseTree(clone);
}
- asts.put(name, clone);
+ asts.put(artifact, clone);
}
/**
@@ -178,23 +183,23 @@
public boolean removeTree(long id)
throws AstException
{
- String name = getTreeName(id);
- asts.remove(name);
+ Artifact artifact = getTreeArtifact(id);
+ asts.remove(artifact);
return super.removeTree(id);
}
/**
- * Check if the AST specified by the given name exists already in the plugin's storage.
+ * Check if the AST specified by the given artifact exists already in the plugin's storage.
*
- * @param name
- * The name (including path) of the AST file to be checked.
+ * @param artifact
+ * The artifact of the AST file to be checked.
*
* @return true if the specified AST is in the plugin's storage.
*/
- public boolean isExistingAst(String name)
+ public boolean isExistingAst(Artifact artifact)
{
- return asts.containsKey(name);
+ return asts.containsKey(artifact);
}
/**
=== modified file 'src/com/goldencode/ast/XmlFilePlugin.java'
--- old/src/com/goldencode/ast/XmlFilePlugin.java 2024-07-05 10:05:22 +0000
+++ new/src/com/goldencode/ast/XmlFilePlugin.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : XmlFilePlugin.java
** Abstract : implements an XML file storage option for an AstManagerPlugin
**
-** Copyright (c) 2005-2023, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 GES 20090513 @42201 Refactored code from AstRegistry and AstPersister to implement the first version.
@@ -28,6 +28,8 @@
** TJD 20220504 Java 11 compatibility minor changes.
** 014 OM 20230915 Allowed to load resources from FS but log it as error.
** 015 ICP 20240705 Fixed method of obtaining the class loader.
+** 016 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250430 Use the resource path when looking for a resource using the class loader.
*/
/*
@@ -89,7 +91,10 @@
import java.util.*;
import java.util.concurrent.*;
import javax.xml.parsers.*;
+
import org.w3c.dom.*;
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.artifacts.ArtifactManager;
import com.goldencode.util.*;
import com.goldencode.p2j.classloader.MultiClassLoader;
import antlr.*;
@@ -272,26 +277,26 @@
}
/**
- * Reverse lookup of the ID that corresponds to a given AST name.
- *
- * @param name
- * Tree name whose unique ID should be returned.
- *
- * @return The tree ID associated with the name or
- * {@link AstManager#INVALID_ID} if the tree name doesn't exist or
+ * Reverse lookup of the ID that corresponds to a given AST artifact.
+ *
+ * @param artifact
+ * Tree artifact whose unique ID should be returned.
+ *
+ * @return The tree ID associated with the artifact or
+ * {@link AstManager#INVALID_ID} if the tree artifact doesn't exist or
* is null.
*/
- public long getTreeId(String name)
+ public long getTreeId(Artifact artifact)
{
- long id = super.getTreeId(name);
+ long id = super.getTreeId(artifact);
if (id == AstManager.INVALID_ID)
{
// try removing a well known suffix
- if (name.endsWith(AST_POSTFIX))
+ if (artifact.endsWith(AST_POSTFIX))
{
- int len = name.length() - AST_POSTFIX_LEN;
- id = super.getTreeId(name.substring(0, len));
+ Artifact originalArtifact = ArtifactManager.getOriginalArtifact(artifact, AST_POSTFIX);
+ id = super.getTreeId(originalArtifact);
}
}
@@ -411,19 +416,19 @@
}
/**
- * Load a named AST from persistent storage.
+ * Load an artifact AST from persistent storage.
*
- * @param name
- * The name of the tree. Often this is a file or resource name.
+ * @param artifact
+ * The artifact of the tree.
*
* @return The loaded AST.
*
* @throws AstException
* On any error during the loading process.
* @throws IllegalArgumentException
- * If the name is invalid or the specified resource doesn't exist.
+ * If the artifact is invalid or the specified resource doesn't exist.
*/
- public Aast loadTree(String name)
+ public Aast loadTree(Artifact artifact)
throws AstException,
IllegalArgumentException
{
@@ -434,57 +439,58 @@
{
if (useResources) // more like 'prefer resources first'
{
- InputStream stream = MultiClassLoader.getClassLoader().getResourceAsStream(name);
+ InputStream stream = MultiClassLoader.getClassLoader()
+ .getResourceAsStream(artifact.getResourcePath());
if (stream != null)
{
dom = XmlHelper.parse(stream);
}
}
- // NOTE: if !useResources and [name] failed to be load as a resource do an attempt to load it from
+ // NOTE: if !useResources and [artifact] failed to be load as a resource do an attempt to load it from
// file system. This should only happen when in developer mode. In production this should be
// a configuration error (or lack or resource itself).
if (dom == null)
{
- File file = new File(name);
- if (file.exists() && file.isFile())
+ if (artifact.exists())
{
- dom = XmlHelper.parse(file);
+ dom = XmlHelper.parse(artifact.getFile());
}
}
if (dom == null)
{
- throw new IllegalArgumentException("Missing/bogus input file/resource " + name);
+ throw new IllegalArgumentException("Missing/bogus input file/resource " +
+ artifact.getRelativePath());
}
root = dom.getDocumentElement();
}
catch (Exception excpt)
{
- throw new AstException("Error loading AST XML file/resource: " + name, excpt);
+ throw new AstException("Error loading AST XML file/resource: " + artifact.getRelativePath(), excpt);
}
return loadTree(root, false);
}
/**
- * Save the given AST to persistent storage under the given name.
+ * Save the given AST to persistent storage under the given artifact.
*
* @param ast
* The tree to save.
- * @param name
- * The name of the tree. Often this is a file name.
+ * @param artifact
+ * The artifact of the tree.
* @param terse
* Do not store line and column data when the node data is saved.
*
* @throws AstException
* On any error during the saving process.
* @throws IllegalArgumentException
- * If the name is invalid or the specified resource cannot be
+ * If the artifact is invalid or the specified resource cannot be
* used as a target to store the AST.
*/
- public void saveTree(Aast ast, String name, boolean terse)
+ public void saveTree(Aast ast, Artifact artifact, boolean terse)
throws AstException,
IllegalArgumentException
{
@@ -493,7 +499,7 @@
throw new IllegalArgumentException("Cannot persist null AST.");
}
- File file = new File(name);
+ File file = artifact.getFile();
// create path if necessary
File dir = file.getParentFile();
@@ -538,20 +544,20 @@
writeTreeLocal(ast, dom, elem, terse);
// persist the XML document as a file
- persist(dom, new File(name));
+ persist(dom, file);
}
/**
- * Check if the AST specified by the given name exists already in the plugin's storage.
+ * Check if the AST specified by the given artifact exists already in the plugin's storage.
*
- * @param name
- * The name (including path) of the AST file to be checked.
+ * @param artifact
+ * The artifact (including path) of the AST file to be checked.
*
* @return true if the specified AST is in the plugin's storage.
*/
- public boolean isExistingAst(String name)
+ public boolean isExistingAst(Artifact artifact)
{
- return new File(name).exists();
+ return artifact.getFile().exists();
}
/**
@@ -602,7 +608,7 @@
Element map = dom.createElement(ELEM_MAP);
map.setAttribute(ATTR_ID, current.toString());
- map.setAttribute(ATTR_TREE, pair.name);
+ map.setAttribute(ATTR_TREE, pair.artifact.getRelativePath());
map.setAttribute(ATTR_NEXT, Long.toString(pair.next));
if (pair.flags != 0)
{
@@ -661,14 +667,15 @@
Long id = Long.valueOf(elem.getAttribute(ATTR_ID));
Long next = Long.valueOf(elem.getAttribute(ATTR_NEXT));
String fname = elem.getAttribute(ATTR_TREE);
+ Artifact artifact = ArtifactManager.addArtifact(fname);
String flags = elem.getAttribute(ATTR_FLAGS);
- Pair pair = new Pair(fname, next);
+ Pair pair = new Pair(artifact, next);
if (!flags.isEmpty())
{
pair.flags = Long.parseLong(flags);
}
- fnames.put(fname, id);
+ fnames.put(artifact, id);
fids.put(id, pair);
}
}
=== modified file 'src/com/goldencode/p2j/cfg/Configuration.java'
--- old/src/com/goldencode/p2j/cfg/Configuration.java 2024-07-09 15:28:19 +0000
+++ new/src/com/goldencode/p2j/cfg/Configuration.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : Configuration.java
** Abstract : Master configuration object
**
-** Copyright (c) 2004-2024, Golden Code Development Corporation.
+** Copyright (c) 2004-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- ----------------------------------Description-----------------------------------
** 001 ECF 20041217 @19157 Created initial version.
@@ -87,6 +87,10 @@
** 025 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
** 026 ICP 20240705 Fixed method of obtaining the class loader.
** 027 GBB 20240709 Making PROP_HOME_DIR public to be reused.
+** 028 GES 20230524 Moved some code to a more generic package.
+** DDF 20250320 Added absoluteFilename() method.
+** DDF 20250327 Replaced FileList usage with ArtifactCollection.
+** DDF 20250423 Make us of artifacts instead of filenames.
*/
/*
@@ -154,11 +158,12 @@
import com.goldencode.p2j.classloader.MultiClassLoader;
import com.goldencode.p2j.util.logging.*;
import org.xml.sax.*;
+
+import com.goldencode.artifacts.*;
import com.goldencode.p2j.schema.*;
import com.goldencode.p2j.schema.SchemaConfig.*;
import com.goldencode.p2j.schema.SchemaConfig.NsConfig.*;
import com.goldencode.p2j.uast.*;
-import com.goldencode.p2j.util.*;
import com.goldencode.util.*;
/**
@@ -350,8 +355,8 @@
*/
private ProfileConfig activeProfile = null;
- /** The resolved files from the {@link #fileSet}, if available. */
- private FileList fileList;
+ /** The resolved artifacts from the {@link #fileSet}, if available. */
+ private ArtifactCollection artifactCol;
/** The loaded schema configuration. */
private SchemaConfig schemaConfig = null;
@@ -540,9 +545,9 @@
/**
* Resolve the configured {@link #fileSet}.
*
- * @return The files used for conversion.
+ * @return The artifacts used for conversion.
*/
- public static FileList getFileList()
+ public static ArtifactCollection getArtifactCol()
{
Configuration cfg = getInstance();
@@ -570,13 +575,12 @@
return null;
}
- if (cfg.fileList == null)
+ if (cfg.artifactCol == null)
{
try
{
boolean caseSens = isCaseSensitive();
- ExplicitFileList res = new ExplicitFileList(caseSens);
-
+ Listnull.
- */
- public static void initializeRootAst(Aast ast,
- File file,
- AstSymbolResolver resolver)
- {
- String filename = file.getAbsolutePath();
- String normal = Configuration.normalizeFilename(filename);
-
- initializeRootAst(ast, normal, resolver);
- }
-
- /**
* Worker routine to centralize initialization of a new AST that is a root node. A new tree
* ID is registered in the {@link com.goldencode.ast.AstManager} and set into the AST.
*
* @param ast
* AST which is the root node to be initialized.
- * @param filename
- * The file in which to persist the new AST. Can be real or virtual (i.e. the file
+ * @param artifact
+ * The artifact in which to persist the new AST. Can be real or virtual (i.e. the artifact
* can be never persisted into the file system, the name is used to map some ID to
* the AST).
* @param resolver
@@ -237,12 +214,12 @@
* in use or null.
*/
public static void initializeRootAst(Aast ast,
- String filename,
+ Artifact artifact,
AstSymbolResolver resolver)
{
try
{
- ast.brainwash(filename);
+ ast.brainwash(artifact);
if (resolver != null)
{
=== modified file 'src/com/goldencode/p2j/convert/BufferScopeWorker.java'
--- old/src/com/goldencode/p2j/convert/BufferScopeWorker.java 2022-05-16 12:34:34 +0000
+++ new/src/com/goldencode/p2j/convert/BufferScopeWorker.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : BufferScopeWorker.java
** Abstract : helper for rule set calculation of record scopes
**
-** Copyright (c) 2005-2022, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- ----------------Description-----------------
** 001 GES 20050921 @22789 First version which supports global and
@@ -35,6 +35,7 @@
** CA 20220316 The lookup of the scope block in case of a free reference must be done using the
** buffer's definition, and not the free reference block.
** CA 20220516 Allow re-initialization of the context-local state.
+** 016 DDF 20250414 Make use of artifacts instead of the filename.
*/
/*
@@ -100,7 +101,6 @@
import com.goldencode.p2j.pattern.*;
import com.goldencode.p2j.security.*;
-
/**
* A pattern worker whose purpose is to provide helpers for calculation of
* all buffers, the blocks to which each buffer is scoped and the list of
@@ -936,7 +936,7 @@
Aast defAst = AstSymbolResolver.getAst(getResolver(), astID, true);
if (defAst != null)
{
- if (defAst.getFilename().equals(ast.getFilename()))
+ if (defAst.getArtifact().equals(ast.getArtifact()))
{
// we are in the same file... check if we are in the same top-level block
Aast tl1 = ExpressionConversionWorker.findTopLevel(ast);
=== modified file 'src/com/goldencode/p2j/convert/ConversionDriver.java'
--- old/src/com/goldencode/p2j/convert/ConversionDriver.java 2025-01-02 14:26:27 +0000
+++ new/src/com/goldencode/p2j/convert/ConversionDriver.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : ConversionDriver.java
** Abstract : runs the entire conversion process for a file or set of files
**
-** Copyright (c) 2006-2024, Golden Code Development Corporation.
+** Copyright (c) 2006-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 GES 20060131 @24171 First version. Supports:
@@ -144,6 +144,11 @@
** 047 OM 20240311 Do not generate the true if the physical DB schemas are not processed.
*
- * @return The list of JAST files to be "brewed".
+ * @return A {@code ArtifactCollection} instance containing artifacts of JAST files to be "brewed".
*
- * @throws ConfigurationException If there is problem reading/parsing the configuration.
- * @throws AstException If there is an problem processing ASTs.
+ * @throws ConfigurationException
+ * If there is problem reading/parsing the configuration.
+ * @throws AstException
+ * If there is a problem when processing ASTs.
*/
- private FileList generateDMOs(boolean skipDBSchema)
+ private ArtifactCollection generateDMOs(boolean skipDBSchema)
throws AstException,
ConfigurationException
{
@@ -960,7 +972,7 @@
debug);
}
- if (sp2os.size() > 0)
+ if (!sp2os.isEmpty())
{
processTrees("Generate Data Model Objects (temp-table DMOs)",
"schema/java_dmo",
@@ -972,9 +984,13 @@
// add generated JASTs to the overall list (used with brew later)
JavaPatternWorker.disableNewFileTracking();
- String[] dmoList = JavaPatternWorker.getPersistedFiles();
+ ArtifactCollection dmoList = JavaPatternWorker.getPersistedArtifacts();
+ List.ast or .jast file
- * suffixes on each entry. Appended to this list is the list of Java ASTs
- * created during frame generation. The results are saved into the
- * Java AST name list.
+ * Using the source name {@code ArtifactCollection} as input, this method creates duplicate
+ * {@code ArtifactCollection} instances with artifacts that have the proper .ast \
+ * or .jast file suffixes on each entry. Appended to this collection is the collection
+ * of Java ASTs created during frame generation. The results are saved into the Java AST name artifact
+ * collection.
*/
private void convertSourceNamesToJavaAstNames()
{
- Listtrue if the Preprocessor should
- * should be forced to run. false if previously
+ * be forced to run. false if previously
* cached preprocessor results should be honored.
* @param schema
* true if the SchemaLoader and
@@ -370,7 +372,7 @@
* else false.
* @param threads
* Number of threads to use for the scan. A non-positive value will enable
- * the default behavior of a work-stealing thread pool with one thread per
+ * the default behavior of a work-stealing thread pool with one thread
* per available CPU. A positive value will create a fixed size thread pool.
*
* @throws Exception If there is a problem.
@@ -408,11 +410,8 @@
* @param schema
* true means that schema related generated files
* should be deleted.
- *
- * @throws IOException If there is a problem with I/O.
*/
protected void cleanScanResults(boolean preproc, boolean schema)
- throws IOException
{
ArrayListExcludeCheck
- * instance is used to remove results from the list on a callback basis.
- *
- * @param speclist
- * List of file specifications.
- * @param check
- * If null, no callback occurs. Otherwise, the
- * exclude method will be called on the passed instance.
- *
- * @throws IOException
- * If there is a problem with I/O.
- */
- protected void deleteFileSpecs(String[] speclist, ExcludeCheck check)
- throws IOException
- {
- for (int i = 0; i < speclist.length; i++)
- {
- int idx = speclist[i].lastIndexOf(File.separator);
- String dir = (idx < 0) ? "." : speclist[i].substring(0, idx);
- String spec = speclist[i].substring(idx + 1);
-
- // create a list of actual files matching this spec
- FileList list = new FileSpecList(new File(dir), spec, false);
- File[] fset = list.list();
-
- for (int j = 0; j < fset.length; j++)
- {
- // prune out the preprocessor cache files
- if (check != null && check.exclude(fset[j].getCanonicalPath()))
- {
- continue;
- }
-
- // delete the file
- fset[j].delete();
- }
- }
- }
-
- /**
* Print a section header and optionally spacers, depending on debug
* level (if level > MSG_NONE then spacers are printed).
*
@@ -734,28 +646,24 @@
* suffixes on each entry. The results are saved into the Progress AST
* name list.
*/
- protected void convertSourceNamesToAstNames()
+ protected void convertSourceArtifactsToAstArtifacts()
{
- List.dict
* or .schema).
*
- * @return The list of files found.
+ * @return The collection of artifacts found.
*/
- protected FileList convertSourceNamesToDictNames(String suffix)
+ protected ArtifactCollection convertSourceArtifactsToDictArtifacts(String suffix)
{
- return new ExplicitFileList(source.withSuffix(suffix));
+ return ArtifactManager.transformArtifactNames(source, suffix, false);
}
/**
@@ -922,32 +829,41 @@
ConversionData.connect();
- // filter the files and keep only the following:
- // - newly added files
- // - changed files
- String[] files = job.files.listFilenames();
- for (int i = 0; i < files.length; i++)
- {
- files[i] = Configuration.normalizeFilename(files[i]);
- }
- Settrue if the element should be excluded from
- * list processing.
- */
- abstract boolean exclude(String name);
- }
-
- /**
- * Helper to only exclude the generated preprocessor files (cache and
- * preprocessor hints) conditionally and to always exclude the manually
- * coded hints files.
- */
- protected class ScanCheck
- extends ExcludeCheck
- {
- /** true if preprocessor files should be deleted. */
- protected boolean preproc = false;
-
- /** true if schema files should be deleted. */
- protected boolean schema = false;
-
- /**
- * Construct and instance and store the preprocessor delete setting.
- *
- * @param preproc
- * true if preprocessor files should be deleted.
- * @param schema
- * true if schema files should be deleted.
- */
- ScanCheck(boolean preproc, boolean schema)
- {
- this.preproc = preproc;
- this.schema = schema;
- }
-
- /**
- * Determines if a given name should be excluded from list processing.
- *
- * @param name
- * The list element to check.
- *
- * @return true if the element should be excluded from
- * list processing.
- */
- boolean exclude(String name)
- {
- return (!preproc && name.endsWith(".cache")) ||
- (!preproc && name.endsWith(".pphints")) ||
- (!schema && name.endsWith(".dict")) ||
- (!schema && name.endsWith(".schema")) ||
- (!schema && name.endsWith(".schema.original")) ||
- (!schema && name.endsWith(".p2o")) ||
- name.endsWith(".schema.hints") ||
- name.endsWith(".hints");
- }
- }
-
- /**
* Interpret the mode command line argument and convert this into the
* effective run mode object. Multiple "+" delimited mode values can
* be included in the same argument. In this case, the result is the
@@ -1221,8 +1062,8 @@
/** Flag indicating if the incremental conversion mode is on. */
public final boolean incremental;
- /** 4GL source files to process. */
- public /*final*/ FileList files;
+ /** Collection of 4GL source artifacts to process. */
+ public ArtifactCollection artifacts;
/** Debug level. */
public final int debug;
@@ -1253,8 +1094,8 @@
* Defines the features of this job.
* @param transform
* User-defined rule-set.
- * @param files
- * The 4GL source files to process.
+ * @param artifacts
+ * The collection of 4GL source artifacts to process.
* @param cfgProfiles
* The optional configuration profiles.
* @param threads
@@ -1268,7 +1109,7 @@
*/
protected JobDefinition(RunMode run,
String transform,
- FileList files,
+ ArtifactCollection artifacts,
List{@code java -DP2J_HOME=
* Where:
*
- *
*
*
null, use the singleton
* from {@link #getResolver()}.
- * @param filename
- * Name of file in which AST is stored.
+ * @param artifact
+ * Artifact in which AST is stored.
*
* @return Aast read from the file.
*
* @throws IllegalArgumentException
- * if there is any error loading filename.
+ * if there is any error loading artifact.
*/
- public static Aast loadTree(AstSymbolResolver resolver, String filename)
+ public static Aast loadTree(AstSymbolResolver resolver, Artifact artifact)
{
if (resolver == null)
{
resolver = getResolver();
}
- final Aast ast = AstManager.get().loadTree(filename);
+ final Aast ast = AstManager.get().loadTree(artifact);
resolver.registerTree(ast);
return ast;
@@ -407,17 +412,17 @@
// the AST was not found among those already loaded and registered; load the enclosing
// tree and try again
- String filename = AstManager.get().getTreeName(id);
- if (!(filename.endsWith(".ast") ||
- filename.endsWith(".dict") ||
- filename.endsWith(".jast") ||
- filename.endsWith(".schema") ||
- filename.endsWith(".p2o")))
+ Artifact artifact = AstManager.get().getTreeArtifact(id);
+ if (!(artifact.endsWith(".ast") ||
+ artifact.endsWith(".dict") ||
+ artifact.endsWith(".jast") ||
+ artifact.endsWith(".schema") ||
+ artifact.endsWith(".p2o")))
{
- filename = String.format("%s.ast", filename);
+ artifact = ArtifactManager.addArtifact(artifact.getRelativePath() + ".ast");
}
- loadTree(resolver, filename);
+ loadTree(resolver, artifact);
ast = getAst(resolver, id, false);
return ast;
=== modified file 'src/com/goldencode/p2j/pattern/CommonAstSupport.java'
--- old/src/com/goldencode/p2j/pattern/CommonAstSupport.java 2024-04-25 20:55:17 +0000
+++ new/src/com/goldencode/p2j/pattern/CommonAstSupport.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : CommonAstSupport.java
** Abstract : Common symbol resolution and function support for AST processing
**
-** Copyright (c) 2005-2024, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 ECF 20050228 @20100 Created initial version. Exposes basic AST
@@ -293,6 +293,10 @@
** 104 CA 20240324 Performance improvement for runtime annotations: are stored using an integer
** instead of string.
** 105 OM 20240416 Extracted UserGeneratedException in its own source file.
+** 106 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250423 Added getArtifact().
+** DDF 20250424 Removed getFile(), the artifact will be used instead.
+** DDF 20250430 Temporarily added back getPersistenceFilename().
*/
/*
@@ -356,6 +360,9 @@
import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.logging.*;
+
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.artifacts.ArtifactManager;
import com.goldencode.ast.*;
import com.goldencode.expr.*;
import com.goldencode.p2j.convert.*;
@@ -1474,37 +1481,37 @@
}
/**
- * Load the AST stored in the given file and return it. Do not register it with the AST
+ * Load the AST stored in the given artifact and return it. Do not register it with the AST
* resolver
*
- * @param filename
- * Name of file in which AST is stored.
+ * @param artifact
+ * Artifact in which AST is stored.
*
- * @return Aast read from the file.
+ * @return Aast read from the artifact.
*
* @throws IllegalArgumentException
- * if there is any error loading filename.
+ * if there is any error loading artifact.
*/
- public Aast parseTree(String filename)
+ public Aast parseTree(Artifact artifact)
{
- return AstManager.get().loadTree(filename);
+ return AstManager.get().loadTree(artifact);
}
/**
- * Load the AST stored in the given file. This will register the AST and all of its
+ * Load the AST stored in the artifact. This will register the AST and all of its
* descendants with the current AST resolver.
*
- * @param filename
- * Name of file in which AST is stored.
+ * @param artifact
+ * Artifact in which AST is stored.
*
- * @return Aast read from the file.
+ * @return Aast read from the artifact.
*
* @throws IllegalArgumentException
- * if there is any error loading filename.
+ * if there is any error loading artifact.
*/
- public Aast loadTree(String filename)
+ public Aast loadTree(Artifact artifact)
{
- return AstSymbolResolver.loadTree(getResolver(), filename);
+ return AstSymbolResolver.loadTree(getResolver(), artifact);
}
/**
@@ -1570,26 +1577,26 @@
}
/**
- * Determines if the given file is a valid AST.
- *
- * @param filename
- * The filename to check. It does not need to have the AST extension.
- *
- * @return true if there is an AST for the given file.
+ * Determines if the given artifact is a valid AST.
+ *
+ * @param artifact
+ * The artifact to check. It does not need to have the AST extension.
+ *
+ * @return true if there is an AST for the given artifact.
*/
- public boolean isAst(String filename)
+ public boolean isAst(Artifact artifact)
{
- if (filename == null || filename.trim().length() == 0)
+ if (artifact == null || artifact.getRelativePath().trim().isEmpty())
{
return false;
}
- if (!filename.endsWith(AstGenerator.AST_POSTFIX))
+ if (!artifact.endsWith(AstGenerator.AST_POSTFIX))
{
- filename = filename + AstGenerator.AST_POSTFIX;
+ artifact = ArtifactManager.addArtifact(artifact.getRelativePath() + AstGenerator.AST_POSTFIX);
}
- return AstManager.get().isExistingAst(filename);
+ return AstManager.get().isExistingAst(artifact);
}
/**
@@ -1680,19 +1687,6 @@
}
/**
- * Get the name of the source code file associated with the current
- * source AST. The filename will be relative to P2J_HOME.
- * file.
- *
- * @return Source code filename.
- */
- public String getFile()
- {
- return Configuration.normalizeFilename(getSource().getFilename());
- }
-
- /**
* Returns the project relative filename of the copy AST persistence
* file, using the default persistence naming convention.
* true if the filename is relative to the
- * project home directory, false if the filename
+ * true if the artifact is relative to the
+ * project home directory, false if the artifact
* is absolute or relative to the current directory.
*
* @return true.
@@ -3542,11 +3545,11 @@
* @throws AstException
* if any error occurs persisting the AST.
*/
- public boolean persist(String filename, boolean projectRelative)
+ public boolean persist(Artifact artifact, boolean projectRelative)
throws ConfigurationException,
AstException
{
- return persist(filename, projectRelative, false);
+ return persist(artifact, projectRelative, false);
}
/**
@@ -3554,11 +3557,11 @@
* convention. This will overwrite any existing file of the same name
* without complaint or warning.
*
- * @param filename
- * The file to persist.
+ * @param artifact
+ * The artifact to persist.
* @param projectRelative
- * true if the filename is relative to the
- * project home directory, false if the filename
+ * true if the artifact is relative to the
+ * project home directory, false if the artifact
* is absolute or relative to the current directory.
* @param terse
* true to persist the AST in terse mode,
@@ -3572,7 +3575,7 @@
* @throws AstException
* if any error occurs persisting the AST.
*/
- public boolean persist(String filename,
+ public boolean persist(Artifact artifact,
boolean projectRelative,
boolean terse)
throws ConfigurationException,
@@ -3580,7 +3583,7 @@
{
Aast root = getCopy().getAncestor(-1);
- return persist(root, filename, projectRelative, terse);
+ return persist(root, artifact, projectRelative, terse);
}
@@ -3591,11 +3594,11 @@
*
* @param root
* The root AST.
- * @param filename
- * The file to persist.
+ * @param artifact
+ * The artifact to persist.
* @param projectRelative
- * true if the filename is relative to the
- * project home directory, false if the filename
+ * true if the artifact is relative to the
+ * project home directory, false if the artifact
* is absolute or relative to the current directory.
* @param terse
* true to persist the AST in terse mode,
@@ -3609,32 +3612,27 @@
* @throws AstException
* if any error occurs persisting the AST.
*/
- public boolean persist(Aast root,
- String filename,
- boolean projectRelative,
- boolean terse)
+ public boolean persist(Aast root,
+ Artifact artifact,
+ boolean projectRelative,
+ boolean terse)
throws ConfigurationException,
AstException
{
- if (projectRelative)
- {
- filename = Configuration.normalizeFilename(filename);
- }
-
- AstManager.get().saveTree(root, filename, terse);
+ AstManager.get().saveTree(root, artifact, terse);
return true;
}
/**
- * Add the given AST as a new program file, by registering its filename.
+ * Add the given AST as a new program file, by registering its artifact.
*
* @param root
* The AST root.
*/
public void addNewProgramFile(Aast root)
{
- engine.addNewProgramFile(root.getFilename());
+ engine.addNewProgramFile(root.getArtifact().getRelativePath());
}
/**
=== modified file 'src/com/goldencode/p2j/pattern/PatternEngine.java'
--- old/src/com/goldencode/p2j/pattern/PatternEngine.java 2023-11-29 15:00:30 +0000
+++ new/src/com/goldencode/p2j/pattern/PatternEngine.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : PatternEngine.java
** Abstract : Main driver for the pattern rules framework
**
-** Copyright (c) 2005-2023, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 ECF 20050301 @20131 Created initial version. Provides a command
@@ -223,6 +223,9 @@
** SVL 20230108 Improved performance by replacing some "for-each" loops with indexed "for" loops.
** 055 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
** 056 CA 20231129 Small changes to avoid 'invokeinterface' in the compiled bytecode.
+** 057 GES 20230524 Moved some code to a more generic package.
+** DDF 20250320 Incorporate usage of artifacts instead of file lists.
+** DDF 20250414 Make use of artifacts instead of the filename.
*/
/*
@@ -285,12 +288,12 @@
import java.util.*;
import java.util.logging.*;
+import com.goldencode.artifacts.*;
import com.goldencode.ast.*;
import com.goldencode.p2j.cfg.*;
import com.goldencode.p2j.convert.*;
import com.goldencode.util.*;
import com.goldencode.p2j.uast.*;
-import com.goldencode.p2j.util.*;
import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.*;
@@ -451,8 +454,8 @@
public final class PatternEngine
extends RuleContainer
{
- /** List of AST filespecs used to locate persisted AST files. */
- private final ArrayListFileList objects used to
- * find ASTs to process.
+ * @return Iterator over AST spec {@code ArtifactCollection} objects used to
+ * find AST artifacts to process.
*/
- public Iteratortrue the file is not supposed to be persisted into the file system,
* the file name is used to map some ID to the AST
@@ -294,7 +299,7 @@
* @throws ConfigurationException
* if P2J environment is not properly initialized.
*/
- public Aast createRootAst(Aast peerRoot, String filename, boolean virtualFile)
+ public Aast createRootAst(Aast peerRoot, Artifact artifact, boolean virtualFile)
throws ConfigurationException
{
WorkArea wa = context.get();
@@ -306,15 +311,7 @@
// create a new target tree
wa.root = createAst(DATA_MODEL, "data model", null, null);
- if (virtualFile)
- {
- initializeRootAst(wa.root, filename, getResolver());
- }
- else
- {
- File file = Configuration.toFile(filename);
- initializeRootAst(wa.root, file, getResolver());
- }
+ initializeRootAst(wa.root, artifact, getResolver());
getResolver().setTargetRootAst(wa.root);
@@ -360,14 +357,13 @@
* @return A unique filename based on the source file root name with
* ".p2o" appended.
*/
- private String generateFilename(Aast ast)
+ private Artifact generateArtifact(Aast ast)
{
- String filename = ast.getFilename();
- filename = filename.substring(0, filename.lastIndexOf("."));
+ Artifact artifact = ast.getArtifact();
+ String filename = artifact.getRelativePath().substring(0, artifact.getRelativePath().lastIndexOf("."));
StringBuilder buf = new StringBuilder(filename);
buf.append(P2O_POSTFIX);
-
- return buf.toString();
+ return ArtifactManager.addArtifact(buf.toString());
}
/**
@@ -452,8 +448,8 @@
*
* @param peerRoot
* Root node of Progress schema AST currently being processed.
- * @param filename
- * The file in which to persist the new AST.
+ * @param artifact
+ * The artifact in which to persist the new AST.
* @param virtualFile
* If true the file is not supposed to be persisted into the file
* system, the file name is used to map some ID to the AST
@@ -463,10 +459,10 @@
* @throws ConfigurationException
* if P2J environment is not properly initialized.
*/
- public Aast createRootAst(Aast peerRoot, String filename, boolean virtualFile)
+ public Aast createRootAst(Aast peerRoot, Artifact artifact, boolean virtualFile)
throws ConfigurationException
{
- return DataModelWorker.this.createRootAst(peerRoot, filename, virtualFile);
+ return DataModelWorker.this.createRootAst(peerRoot, artifact, virtualFile);
}
/**
@@ -885,9 +881,12 @@
{
try
{
- String file = getSource().getFilename();
- int pos = file.lastIndexOf('.');
- Aast root = AstManager.get().loadTree(file.substring(0, pos) + "." + extension);
+ Artifact file = getSource().getArtifact();
+ int pos = file.getRelativePath().lastIndexOf('.');
+ Artifact artifact = ArtifactManager.addArtifact(file.getRelativePath().substring(0, pos) +
+ "." +
+ extension);
+ Aast root = AstManager.get().loadTree(artifact);
registerTree(root);
}
catch (Exception exc)
@@ -910,17 +909,15 @@
{
WorkArea wa = context.get();
- String filename = generateFilename(getSource());
+ Artifact artifact = generateArtifact(getSource());
// bypass persistence if there is an empty tree
if (wa.root.getNumImmediateChildren() == 0)
{
try
{
- String normal = Configuration.normalizeFilename(filename);
-
// no need to maintain this value in the registry
- AstManager.get().removeTree(normal);
+ AstManager.get().removeTree(artifact);
}
catch (Exception exc)
{
@@ -932,13 +929,11 @@
try
{
- filename = Configuration.normalizeFilename(filename);
-
// read the existing target tree
- AstManager.get().saveTree(wa.root, filename, false);
+ AstManager.get().saveTree(wa.root, artifact, false);
// ensure the AST node values remain in the map as their ID, and not the full AST.
- ConversionData.compact("tmpTabNodes", filename);
+ ConversionData.compact("tmpTabNodes", artifact);
}
catch (Exception exc)
{
=== modified file 'src/com/goldencode/p2j/schema/P2OAccessWorker.java'
--- old/src/com/goldencode/p2j/schema/P2OAccessWorker.java 2025-03-19 13:44:21 +0000
+++ new/src/com/goldencode/p2j/schema/P2OAccessWorker.java 2025-05-09 07:59:16 +0000
@@ -77,7 +77,9 @@
** RAA 20240910 checkFieldMatching now uses the legacy name criteria instead of the order by.
** 026 OM 20241128 Multi-tenant conversion support: added getTenantType() method.
** 027 CA 20250319 This worker can be used before the 'qualified_oo_name' is set in annotation
-** (like in schema conversion phase), so ensure we can load the ClassDefinition.
+** (like in schema conversion phase), so ensure we can load the ClassDefinition.
+** 028 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250430 Avoid NPE when there's no artifact for the visited ast at server startup.
*/
/*
@@ -139,6 +141,7 @@
import java.util.*;
import java.util.logging.*;
+import com.goldencode.artifacts.Artifact;
import com.goldencode.ast.*;
import com.goldencode.p2j.convert.*;
import com.goldencode.util.*;
@@ -253,8 +256,12 @@
WorkArea wa = context.get();
ClassDefinition clsDef = SymbolResolver.resolveClassDefinition(ast);
- String fileName = ast.getFilename();
- P2OLookup.loadTemporarySchema(fileName, clsDef);
+ Artifact artifact = ast.getArtifact();
+ // There's one call ends up searching for a ./null.p2o file.
+ if (artifact != null)
+ {
+ P2OLookup.loadTemporarySchema(artifact, clsDef);
+ }
wa.suspiciousQueries.clear();
wa.indeterminateSortQueries.clear();
}
@@ -1109,8 +1116,8 @@
*/
private static class QueryIndexInfo
{
- /** The source file in which the query was found. */
- private final String sourceFile;
+ /** The source artifact in which the query was found. */
+ private final Artifact sourceArtifact;
/** The table against which the query is executed. */
private final String tableName;
@@ -1142,7 +1149,7 @@
QueryIndexInfo(Aast ast, String comment, String indexName, int risk)
throws SchemaException
{
- this.sourceFile = ast.getFilename();
+ this.sourceArtifact = ast.getArtifact();
this.tableName = getTableName(ast);
this.comment = comment;
this.indexName = indexName;
@@ -1172,7 +1179,7 @@
throws IOException,
SchemaException
{
- String cacheFile = sourceFile + ".cache";
+ String cacheFile = sourceArtifact.getRelativePath() + ".cache";
String sep = System.lineSeparator();
String dsep = sep + sep;
String pad = " ";
@@ -1215,7 +1222,7 @@
throws IOException,
SchemaException
{
- String cacheFile = sourceFile + ".cache";
+ String cacheFile = sourceArtifact.getRelativePath() + ".cache";
String sep = System.lineSeparator();
try (BufferedReader br = new BufferedReader(new FileReader(cacheFile)))
=== modified file 'src/com/goldencode/p2j/schema/P2OLookup.java'
--- old/src/com/goldencode/p2j/schema/P2OLookup.java 2025-02-18 11:48:12 +0000
+++ new/src/com/goldencode/p2j/schema/P2OLookup.java 2025-05-09 07:59:16 +0000
@@ -109,6 +109,10 @@
** RAA 20240906 Added writeHeaderToIndeterminateSortFile() method.
** 046 OM 20241128 Multi-tenant conversion support: added getTenantType() method.
** 047 DDF 20240205 Added NON_NULLABLE annotation to index component.
+** 048 DDF 20250320 Create artifacts for .p2o files.
+** DDF 20250408 Create the artifact for a missed .p2o scenario.
+** DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250423 Replace more usages of filename with artifacts.
*/
/*
@@ -171,6 +175,8 @@
import java.util.function.*;
import java.util.logging.*;
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.artifacts.ArtifactManager;
import com.goldencode.ast.*;
import com.goldencode.p2j.convert.*;
import com.goldencode.util.*;
@@ -401,13 +407,13 @@
/**
* Attempts to locate the {@code P2OLookup} for an existing dynamic or temporary schema. The AST tree of
- * {@code filename} is loaded and the {@code dynamic} flag from its root is analyzed for deciding whether
+ * {@code artifact} is loaded and the {@code dynamic} flag from its root is analyzed for deciding whether
* it is dynamic or not. In the first case, the existing {@code P20Lookup} instance is returned if one
* exist. Otherwise, the application defaults to temp-table mode and a new {@code P2OLookup} instance
* is created and returned.
*
- * @param filename
- * Name of file containing the P2O AST to load. File may or may not exist.
+ * @param artifact
+ * Artifact containing the P2O AST to load. Artifact file may or may not exist.
* @param clsDef
* The associated class definition for this file, otherwise {@code null}.
*
@@ -417,12 +423,12 @@
* if there is any error loading P2J schema configuration data;
* if there is any error loading the AST from persistence.
*/
- private static P2OLookup dynamicGet(String filename, ClassDefinition clsDef)
+ private static P2OLookup dynamicGet(Artifact artifact, ClassDefinition clsDef)
throws SchemaException
{
- if (AstManager.get().isExistingAst(filename))
+ if (AstManager.get().isExistingAst(artifact))
{
- Aast root = AstManager.get().loadTree(filename);
+ Aast root = AstManager.get().loadTree(artifact);
if (root.isAnnotation(SchemaDictionary.MUTABLE_ANNOTATION))
{
P2OLookup dynamicInstance = getInstance(root.getText(), 0);
@@ -433,7 +439,7 @@
}
}
}
- return new P2OLookup(TEMP_TABLE_KEY, filename, clsDef);
+ return new P2OLookup(TEMP_TABLE_KEY, artifact, clsDef);
}
/**
@@ -447,8 +453,8 @@
*
* @param schema
* Database schema name to which this instance is mapped.
- * @param filename
- * Name of file containing the P2O AST to load. File may or may not exist.
+ * @param artifact
+ * Artifact containing the P2O AST to load. Artifact file may or may not exist.
* @param clsDef
* The associated class definition for this file, otherwise null.
*
@@ -456,14 +462,14 @@
* if there is any error loading P2J schema configuration data;
* if there is any error loading the AST from persistence.
*/
- private P2OLookup(String schema, String filename, ClassDefinition clsDef)
+ private P2OLookup(String schema, Artifact artifact, ClassDefinition clsDef)
throws SchemaException
{
- if (AstManager.get().isExistingAst(filename))
+ if (AstManager.get().isExistingAst(artifact))
{
try
{
- initialize(schema, AstManager.get().loadTree(filename), false);
+ initialize(schema, AstManager.get().loadTree(artifact), false);
}
catch (AstException exc)
{
@@ -491,12 +497,12 @@
{
if (exc[0] == null && !cls.isBuiltIn())
{
- String parentFile = cls.getFilename();
+ String parentFile = cls.getArtifact().getRelativePath();
parentFile += P2O_POSTFIX;
- parentFile = Configuration.normalizeFilename(parentFile);
+ Artifact pArtifact = ArtifactManager.addArtifact(parentFile);
try
{
- parr.add(new P2OLookup(schema, parentFile, cls));
+ parr.add(new P2OLookup(schema, pArtifact, cls));
}
catch (SchemaException e)
{
@@ -544,7 +550,7 @@
}
/**
- * Attempt to load the P2O AST stored in filename, which must
+ * Attempt to load the P2O AST stored in artifact, which must
* represent a temp/work-table schema. This method should be invoked by
* conversion service pattern workers which need to load temporary schema
* information upon loading a new source file AST. A new instance of this
@@ -553,14 +559,14 @@
* succession with the same file name, only the first invocation triggers
* the P2O AST to be loaded.
* filename, an empty
+ * If no file exists with the artifact/code>, an empty
* instance of this class is stored in the schema map under the temp table
* schema key. This ensures that an out-of-date P2OLookup
* instance is not maintained under the temp table key beyond it useful
* life.
*
- * @param filename
- * Name of file containing the P2O AST to load. File may or may
+ * @param artifact
+ * Artifact containing the P2O AST to load. Artifact file may or may
* not exist, but this value may not be null.
* @param clsDef
* The associated class definition for this file, otherwise null.
@@ -570,25 +576,23 @@
* the given file; non-existence of the file is not considered
* an error.
*/
- public static void loadTemporarySchema(String filename, ClassDefinition clsDef)
+ public static void loadTemporarySchema(Artifact artifact, ClassDefinition clsDef)
{
- filename += P2O_POSTFIX;
- filename = Configuration.normalizeFilename(filename);
-
+ Artifact p2oArtifact = ArtifactManager.addArtifact(artifact.getRelativePath() + P2O_POSTFIX);
WorkArea wa = locate();
- if (!filename.equals(wa.lastTempFilename))
+ if (!p2oArtifact.getRelativePath().equals(wa.lastTempFilename))
{
try
{
- P2OLookup.dynamicGet(filename, clsDef);
+ P2OLookup.dynamicGet(p2oArtifact, clsDef);
}
catch (SchemaException exc)
{
throw new RuntimeException(exc);
}
- wa.lastTempFilename = filename;
+ wa.lastTempFilename = p2oArtifact.getRelativePath();
}
}
@@ -2229,22 +2233,21 @@
{
SchemaConfig config = Configuration.getSchemaConfig();
boolean runtime = Configuration.isRuntimeConfig();
- String path;
+ Artifact artifact;
if (runtime)
{
- path = config.getSchemaResource(database, P2O_POSTFIX);
- if (path == null)
+ artifact = config.getSchemaResource(database, P2O_POSTFIX);
+ if (artifact == null)
{
throw new ConfigurationException("Cannot find " + P2O_POSTFIX + " for database " + database);
}
}
else
{
- File file = config.getSchemaFile(database, P2O_POSTFIX);
- path = Configuration.normalizeFilename(file.getAbsolutePath());
+ artifact = config.getSchemaFile(database, P2O_POSTFIX);
}
- return AstManager.get().loadTree(path);
+ return AstManager.get().loadTree(artifact);
}
/**
=== modified file 'src/com/goldencode/p2j/schema/SchemaConfig.java'
--- old/src/com/goldencode/p2j/schema/SchemaConfig.java 2025-02-19 11:21:56 +0000
+++ new/src/com/goldencode/p2j/schema/SchemaConfig.java 2025-05-09 07:59:16 +0000
@@ -53,6 +53,8 @@
** 020 CA 20230705 For the 'standard' namespace, the 'default database' value must be 'false'.
** 021 ICP 20240705 Fixed method of obtaining the class loader.
** 022 DDF 20250219 Replaced mandatoryTables() call with filterTables().
+** 023 DDF 20250423 Replace usage of filename with artifacts.
+** DDF 20250430 Use the resource path when looking for a resource using the class loader.
*/
/*
@@ -113,6 +115,9 @@
import java.io.*;
import java.util.*;
import java.util.logging.*;
+
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.artifacts.ArtifactManager;
import com.goldencode.p2j.cfg.*;
import com.goldencode.p2j.cfg.Parameter;
import com.goldencode.p2j.classloader.MultiClassLoader;
@@ -505,42 +510,34 @@
}
/**
- * Returns a file object representing the import (DF) file associated with the specified database schema
- * name of the default profile. The file's path is fully qualified.
+ * Returns an artifact object representing the import (DF) file associated with the specified database
+ * schema name of the default profile. The file's path is fully qualified.
*
* @param nsName
* Name of desired namespace configuration
*
- * @return Import file.
- *
- * @throws ConfigurationException
- * if environment has not been configured correctly.
+ * @return Import file artifact.
*/
- public File getImportFile(String nsName)
- throws ConfigurationException
+ public Artifact getImportFile(String nsName)
{
return getImportFile(null, nsName);
}
/**
- * Returns a file object representing the import (DF) file associated with the specified database schema
- * name in a specific profile. The file's path is fully qualified.
+ * Returns an artifact object representing the import (DF) file associated with the specified database
+ * schema name in a specific profile. The file's path is fully qualified.
*
* @param profile
* The profile to be processed. If {@code null} the default profile will be used.
* @param nsName
* Name of desired namespace configuration
*
- * @return Import file.
- *
- * @throws ConfigurationException
- * if environment has not been configured correctly.
+ * @return Import file artifact.
*/
- public File getImportFile(String profile, String nsName)
- throws ConfigurationException
+ public Artifact getImportFile(String profile, String nsName)
{
NsConfig cfg = getProfile(profile, false).nsConfigs.get(nsName == null ? null : nsName.toLowerCase());
- return (cfg != null) ? Configuration.toFile(cfg.getImportFile()) : null;
+ return (cfg != null) ? cfg.getImportFile() : null;
}
/**
@@ -581,28 +578,24 @@
}
/**
- * Returns a file object representing the XML document associated with the specified database schema name
- * of the default profile. The file's path is fully qualified.
+ * Returns an artifact object representing the XML document associated with the specified database schema
+ * name of the default profile. The file's path is fully qualified.
*
* @param nsName
* Name of desired namespace configuration
* @param type
* the type of resource (the file extension, including the dot).
*
- * @return File containing namespace schema XML document.
- *
- * @throws ConfigurationException
- * if environment has not been configured correctly.
+ * @return Artifact containing namespace schema XML document.
*/
- public File getSchemaFile(String nsName, String type)
- throws ConfigurationException
+ public Artifact getSchemaFile(String nsName, String type)
{
return getSchemaFile(null, nsName, type);
}
/**
- * Returns a file object representing the XML document associated with the specified database schema name
- * of the specific profile. The file's path is fully qualified.
+ * Returns an artifact object representing the XML document associated with the specified database schema
+ * name of the specific profile. The file's path is fully qualified.
*
* @param profile
* The profile to be processed. If {@code null} the default profile will be used.
@@ -611,13 +604,9 @@
* @param type
* the type of resource (the file extension, including the dot).
*
- * @return File containing namespace schema XML document.
- *
- * @throws ConfigurationException
- * if environment has not been configured correctly.
+ * @return Artifact containing namespace schema XML document.
*/
- public File getSchemaFile(String profile, String nsName, String type)
- throws ConfigurationException
+ public Artifact getSchemaFile(String profile, String nsName, String type)
{
NsConfig cfg = getProfile(profile, false).nsConfigs.get(nsName == null ? null : nsName.toLowerCase());
if (cfg == null)
@@ -625,11 +614,11 @@
return null;
}
- return Configuration.toFile(getSchemaFileName(profile, nsName, type));
+ return getSchemaFileName(profile, nsName, type);
}
/**
- * Returns path to the resource representing the XML document associated with the specified
+ * Returns an artifact of the resource representing the XML document associated with the specified
* database schema name in the default profile.
*
* @param nsName
@@ -637,17 +626,17 @@
* @param type
* the type of resource (the file extension, including the dot).
*
- * @return path to the resource containing namespace schema XML document or {@code null} if the resource
- * doesn't exist.
+ * @return Artifact of the resource containing namespace schema XML document or {@code null} if the
+ * resource doesn't exist.
*/
- public String getSchemaFileName(String nsName, String type)
+ public Artifact getSchemaFileName(String nsName, String type)
{
return getSchemaFileName(null, nsName, type);
}
/**
- * Returns path to the resource representing the XML document associated with the specified database schema
- * name in the requested profile.
+ * Returns an artifact of the resource representing the XML document associated with the specified
+ * database schema name in the requested profile.
*
* @param profile
* The profile to be processed. If {@code null} the default profile will be used.
@@ -656,15 +645,15 @@
* @param type
* the type of resource (the file extension, including the dot).
*
- * @return path to the resource containing namespace schema XML document or {@code null} if the resource
- * doesn't exist.
+ * @return Artifact of the resource containing namespace schema XML document or {@code null} if the
+ * resource doesn't exist.
*/
- public String getSchemaFileName(String profile, String nsName, String type)
+ public Artifact getSchemaFileName(String profile, String nsName, String type)
{
NsConfig cfg = getProfile(profile, false).nsConfigs.get(nsName == null ? null : nsName.toLowerCase());
if (cfg != null)
{
- return cfg.getDataArtifactsLocation() + "/" + nsName + type;
+ return ArtifactManager.addArtifact(cfg.getDataArtifactsLocation() + "/" + nsName + type);
}
return null;
@@ -679,17 +668,17 @@
* @param type
* the type of resource (the file extension, including the dot).
*
- * @return path to the resource containing namespace schema XML document or {@code null} if the resource
- * doesn't exist.
+ * @return Artifact of the resource containing namespace schema XML document or {@code null} if the
+ * resource doesn't exist.
*/
- public String getSchemaResource(String nsName, String type)
+ public Artifact getSchemaResource(String nsName, String type)
{
return getSchemaResource(null, nsName, type);
}
/**
- * Returns path to the resource representing the XML document associated with the specified database schema
- * name in the requested profile.
+ * Returns path to the resource representing the XML document associated with the specified database
+ * schema name in the requested profile.
*
* @param profile
* The profile to be processed. If {@code null} the default profile will be used.
@@ -698,16 +687,16 @@
* @param type
* the type of resource (the file extension, including the dot).
*
- * @return path to the resource containing namespace schema XML document or {@code null} if the resource
- * doesn't exist.
+ * @return Artifact of the resource containing namespace schema XML document or {@code null} if the
+ * resource doesn't exist.
*/
- public String getSchemaResource(String profile, String nsName, String type)
+ public Artifact getSchemaResource(String profile, String nsName, String type)
{
- String resourceName = getSchemaFileName(profile, nsName, type);
+ Artifact resourceName = getSchemaFileName(profile, nsName, type);
if (resourceName != null)
{
- if (MultiClassLoader.getClassLoader().getResource(resourceName) != null)
+ if (MultiClassLoader.getClassLoader().getResource(resourceName.getResourcePath()) != null)
{
return resourceName;
}
@@ -716,17 +705,21 @@
// while working on IDE, without the need to have a full application jar built
if (!developerModeWarned)
{
- LOG.log(Level.SEVERE, "Failed to locate '" + resourceName + "' as a resource. Using developer " +
- "mode: attempting to locate it as local file in ${cvtpath} location.");
+ LOG.log(Level.SEVERE, "Failed to locate '" +
+ resourceName.getRelativePath() +
+ "' as a resource. Using developer " +
+ "mode: attempting to locate it as local file in ${cvtpath} location.");
developerModeWarned = true;
}
try
{
- File toFile = Configuration.toFile(Configuration.getParameter("cvtpath") + "/" + resourceName);
+ File toFile = Configuration.toFile(Configuration.getParameter("cvtpath") +
+ "/" +
+ resourceName.getRelativePath());
if (toFile.exists())
{
- return toFile.getCanonicalPath();
+ return ArtifactManager.addArtifact(toFile.getCanonicalPath());
}
}
catch (ConfigurationException | IOException e)
@@ -831,7 +824,7 @@
sb.append("\n ");
sb.append(ns.getName());
sb.append(":");
- sb.append("\n importFile = ").append(ns.getImportFile());
+ sb.append("\n importFile = ").append(ns.getImportFile().getRelativePath());
sb.append("\n *dataArtifacts = ").append(ns.getDataArtifactsLocation());
sb.append("\n mutable = ").append(ns.isMutable());
sb.append("\n default = ").append(ns.isDefault());
@@ -947,8 +940,8 @@
/** Whether the schema is mutable (it can be modified externally and is scanned at runtime) */
private boolean mutable = false;
- /** Name of {@code .df} import file. */
- private String importFile;
+ /** Artifact of {@code .df} import file. */
+ private Artifact importFile;
/** SQL name conversion override for SQL table and column names. */
private int conversion = MatchPhraseConstants.SQL_MODE_DEFAULT;
@@ -1017,29 +1010,32 @@
}
/**
- * Get DF import filename, defaulting to standard location for {@code .df} files if not explicitly
+ * Get DF import file artifact, defaulting to standard location for {@code .df} files if not explicitly
* configured in {@code p2j.cfg.xml}.
*
- * @return Import filename.
+ * @return Import file artifact.
*/
- public String getImportFile()
+ public Artifact getImportFile()
{
if (importFile != null)
{
- return Configuration.getInstance().substituteParms(importFile);
+ return importFile;
}
- return "data/" + name + ".df";
+
+ return ArtifactManager.addArtifact("data/" + name + ".df");
}
/**
* Set DF import filename.
+ * This method is called when the configuration is created, it requires a file to be parsed so it is
+ * not possible to use an {@code Artifact} as a parameter.
*
* @param importFile
* Import filename.
*/
public void setImportFile(String importFile)
{
- this.importFile = importFile;
+ this.importFile = ArtifactManager.addArtifact(importFile);
}
/**
@@ -1093,7 +1089,8 @@
public String getDataArtifactsLocation()
{
// use the import file (.df) to compute the path relative to project's root
- String importFile = getImportFile().replace('\\', '/');
+ Artifact importArtifact = getImportFile();
+ String importFile = importArtifact.getRelativePath();
int i = importFile.lastIndexOf("/");
String path = "";
=== modified file 'src/com/goldencode/p2j/schema/SchemaDictionary.java'
--- old/src/com/goldencode/p2j/schema/SchemaDictionary.java 2025-02-17 07:55:49 +0000
+++ new/src/com/goldencode/p2j/schema/SchemaDictionary.java 2025-05-09 07:59:16 +0000
@@ -2,7 +2,7 @@
** Module : SchemaDictionary.java
** Abstract : schema namespace dictionary
**
-** Copyright (c) 2004-2024, Golden Code Development Corporation.
+** Copyright (c) 2004-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 ECF 20041216 @19178 Created initial version.
@@ -558,6 +558,7 @@
** the lookup to a specific table, use the normal node search algorithm instead
** 109 RNC 20241030 Added null check in getTableProperty(String, int).
** 110 CA 20241104 'getFirstDatabase' must check 'bannedSchemas'.
+** 111 DDF 20250414 Make use of artifacts instead of the filename.
*/
/*
@@ -619,6 +620,8 @@
import java.lang.ref.*;
import java.util.*;
import java.util.logging.*;
+
+import com.goldencode.artifacts.Artifact;
import com.goldencode.ast.*;
import com.goldencode.p2j.cfg.*;
import com.goldencode.p2j.convert.*;
@@ -3738,16 +3741,16 @@
* regular schema is persisted separately and shared across all source
* files.
*
- * @param srcFile
- * Name of the 4GL source code file containing the schema
+ * @param srcArtifact
+ * Artifact of the 4GL source code file containing the schema
* definitions being persisted.
- * @param schemaFile
- * Name of schema persistence file.
+ * @param schemaArtifact
+ * Artifact of schema persistence file.
*
* @throws AstException
* if any error occurs writing persistence file.
*/
- public void persist(String srcFile, String schemaFile)
+ public void persist(Artifact srcArtifact, Artifact schemaArtifact)
throws AstException
{
Listnull if no such editing is needed.
* @param idx
@@ -989,10 +992,10 @@
* if the file cannot be found, or if there is some other error
* during processing.
*/
- public Aast processFile(String filename, Listfilename does not exist.
+ * if artifact file does not exist.
* @throws IOException
* If a problem occurs during preprocessing or caching.
*/
- private Reader prepareDataStream(String filename)
+ private Reader prepareDataStream(Artifact artifact)
throws FileNotFoundException,
IOException
{
- File file = Utils.findFileInPath(filename, paths);
+ File file = Utils.findFileInPath(artifact.getRelativePath(), paths);
Reader in = null;
if (preprocess)
@@ -1475,35 +1459,10 @@
}
/**
- * Search the list to find a duplicate to the given name and remove it
- * if found. Once the first matching entry is found, it will be set to
- * null and the method will return.
- *
- * @param list
- * Array to edit.
- * @param duplicate
- * Name of the file to remove. This may be null
- * but then why would you call this method?
- */
- private void removeDuplicate(Listtrue if this class file represents a built-in class or interface.
@@ -1515,25 +1474,23 @@
* @throws AstException
* if the file cannot be found, or if there is some other error during processing.
*/
- void preScanClass(String filename, boolean builtin, boolean dotnet, String[] propath)
+ void preScanClass(Artifact artifact, boolean builtin, boolean dotnet, String[] propath)
throws AstException,
ANTLRException,
IOException
{
- filename = Configuration.normalizeFilename(filename);
-
boolean caseSens = Configuration.getParameter(CASE_SENS_KEY, true);
UastHints saveHints = hints;
String[] savePaths = paths;
-
+
try
{
// exclude all other access to this file
- mgr.lockTree(filename, false);
+ artifact.lock();
// TODO: hints will not work, as this is called recursive... need a stack approach
- hints = new UastHints(filename);
+ hints = new UastHints(artifact.getRelativePath());
this.paths = propath;
@@ -1550,11 +1507,11 @@
// 2nd pass (e.g. an instance method can be called in an expression
// earlier in the file than where that method's definition appears)
- ProgressLexer lexer = prepareLexer(filename, sym);
+ ProgressLexer lexer = prepareLexer(artifact, sym);
ProgressParser parser = null;
parser = new ProgressParser(lexer, sym);
- parser.setFilename(filename);
+ parser.setFilename(artifact.getRelativePath());
parser.setBuiltInCls(builtin);
parser.setDotNetCls(dotnet);
parser.pre_scan_class();
@@ -1568,7 +1525,7 @@
catch (Exception exc)
{
- throw new AstException("Error processing " + filename, exc);
+ throw new AstException("Error processing " + artifact.getRelativePath(), exc);
}
finally
@@ -1580,7 +1537,7 @@
hints = saveHints;
// clear our lock
- mgr.unlockTree(filename);
+ artifact.unlock();
}
// if everything was completed OK and this is a built-in class, do a full parse to save
@@ -1591,7 +1548,7 @@
this.astPersist = true;
try
{
- processFile(filename, null, -1);
+ processFile(artifact, null, -1);
}
finally
{
@@ -1601,18 +1558,18 @@
}
/**
- * Parse the source code read from the specified filename into an abstract
+ * Parse the source code read from the specified artifact into an abstract
* syntax tree. Uses the Progress parser and its helpers to do this work.
*
- * @param filename
- * The name of the file being processed.
+ * @param artifact
+ * The artifact of the file being processed.
*
* @return Root of the AST created by the parser.
*
* @throws ANTLRException
* if any error occurs while lexing or parsing the source code.
*/
- private Aast parse(String filename, SetPARSER_POSTFIX.
*
- * @param filename
- * Original source file being processed.
+ * @param artifact
+ * Original source artifact being processed.
* @param ast
* The AST to dump.
*/
- private void generateParseReport(String filename, Aast ast)
+ private void generateParseReport(Artifact artifact, Aast ast)
{
- PrintStream out = createUniqueStream(filename, PARSER_POSTFIX);
+ PrintStream out = createUniqueStream(artifact.getRelativePath(), PARSER_POSTFIX);
DumpTree visitor = new DumpTree(out);
visitor.visit(ast);
@@ -1915,25 +1874,25 @@
* original source file's name, with a standard extension of
* AST_POSTFIX.
*
- * @param filename
- * Original source file being processed.
+ * @param artifact
+ * Original source artifact being processed.
* @param ast
* The AST to dump.
*/
- private void persistAst(String filename, Aast ast)
+ private void persistAst(Artifact artifact, Aast ast)
throws AstException
{
- File target = createUniqueFile(filename, AST_POSTFIX);
- String fname = null;
+ File target = createUniqueFile(artifact.getRelativePath(), AST_POSTFIX);
+ Artifact fname = null;
try
{
- fname = target.getCanonicalPath();
+ fname = ArtifactManager.addArtifact(target.getCanonicalPath());
}
catch (IOException ioe)
{
- throw new AstException("Invalid filename " + filename, ioe);
+ throw new AstException("Invalid filename " + artifact.getRelativePath(), ioe);
}
AstManager.get().saveTree(ast, fname, false);
@@ -1960,10 +1919,10 @@
}
/**
- * Loads a previously persisted AST for a specified source file.
+ * Loads a previously persisted AST for a specified source artifact.
*
- * @param filename
- * The source filename for which a matching persisted AST will
+ * @param artifact
+ * The source artfact for which a matching persisted AST will
* be loaded.
*
* @return The AST associated with the specified source file.
@@ -1971,21 +1930,21 @@
* @throws AstException
* if there are any problems with loading the AST.
*/
- private Aast loadPersistedAst(String filename)
+ private Aast loadPersistedAst(Artifact artifact)
throws AstException
{
- File source = createUniqueFile(filename, AST_POSTFIX);
+ File source = createUniqueFile(artifact.getRelativePath(), AST_POSTFIX);
- String fname = null;
+ Artifact fname = null;
try
{
- fname = source.getCanonicalPath();
+ fname = ArtifactManager.addArtifact(source.getCanonicalPath());
}
catch (IOException ioe)
{
- throw new AstException("Invalid filename " + filename, ioe);
+ throw new AstException("Invalid filename " + artifact.getRelativePath(), ioe);
}
return AstManager.get().loadTree(fname);
=== modified file 'src/com/goldencode/p2j/uast/AstKey.java'
--- old/src/com/goldencode/p2j/uast/AstKey.java 2023-05-12 10:05:12 +0000
+++ new/src/com/goldencode/p2j/uast/AstKey.java 2025-05-09 07:59:18 +0000
@@ -2,7 +2,7 @@
** Module : AstKey.java
** Abstract : a container for an AST which can be used as a hash key
**
-** Copyright (c) 2006-2023, Golden Code Development Corporation.
+** Copyright (c) 2006-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- ----------------Description-----------------
** 001 ECF 20060201 @24281 Created initial version. A container for an
@@ -25,7 +25,10 @@
** 008 CA 20230215 Fixed a bug in writeExternal - if the ast is null, write the astId, as the AST
** may not have needed to be loaded for this AstKey instance.
** 009 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
+** 010 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -86,6 +89,7 @@
import java.util.*;
import java.util.logging.*;
+import com.goldencode.artifacts.Artifact;
import com.goldencode.ast.*;
import com.goldencode.p2j.convert.*;
import com.goldencode.p2j.pattern.*;
@@ -675,7 +679,7 @@
{
AstManager mgr = AstManager.get();
long treeId = mgr.getTreeId(astId);
- Aast tree = mgr.loadTree(mgr.getTreeName(treeId));
+ Aast tree = mgr.loadTree(mgr.getTreeArtifact(treeId));
resolver.registerTree(tree.duplicate());
ast = resolver.getAst(astId);
}
@@ -688,9 +692,9 @@
* methods against two P2O ASTs.
*
* @param args
- * Two filenames are expected (the persisted ASTs to be loaded).
+ * Two artifacts are expected (the persisted ASTs to be loaded).
*/
- public static void main(String[] args)
+ public static void main(Artifact[] args)
{
try
{
=== modified file 'src/com/goldencode/p2j/uast/CallGraphWorker.java'
--- old/src/com/goldencode/p2j/uast/CallGraphWorker.java 2024-04-17 10:14:07 +0000
+++ new/src/com/goldencode/p2j/uast/CallGraphWorker.java 2025-05-09 07:59:18 +0000
@@ -3,7 +3,7 @@
** Abstract : provides a pattern engine service to create a new call graph based on matches
** found during AST processing
**
-** Copyright (c) 2005-2024, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- ----------------------------Description-----------------------------
** 001 GES 20050311 @20310 Created initial version that provides support for creating the call
@@ -76,6 +76,10 @@
** InMemoryRegistryPlugin is not thread-safe.
** 027 TJD 20240208 Java 17 dependencies updates
** TJD 20240216 Newer versions of JanusDB require MixedTypeIndexes when using aggregates
+** 028 GES 20230524 Moved some code to a more generic package.
+** DDF 20250327 Replaced usage of FileSpecList with ArtifactCollection.
+** DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
/*
@@ -139,6 +143,7 @@
import java.util.concurrent.atomic.*;
import java.util.function.*;
+import com.goldencode.artifacts.*;
import com.goldencode.ast.*;
import com.goldencode.graphdb.*;
import com.goldencode.p2j.cfg.*;
@@ -149,7 +154,6 @@
import org.janusgraph.graphdb.types.system.SystemTypeManager;
import org.apache.tinkerpop.gremlin.structure.*;
-import org.apache.tinkerpop.gremlin.process.traversal.*;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.*;
import static org.janusgraph.core.attribute.Text.*;
@@ -457,10 +461,10 @@
{
Vertex node = itr.next();
- String filename = mgr.getTreeName((long) node.true if this is a .NET definition,
* false if this is a 4GL definition.
- * @param filename
- * The filename of the .cls that defined this class/interface.
+ * @param artifact
+ * The artifact of the .cls that defined this class/interface.
*/
public ClassDefinition(String name,
ClassDefinition[] parents,
@@ -405,7 +409,7 @@
boolean builtin,
OOType otype,
boolean dotnet,
- String filename)
+ Artifact artifact)
{
this.name = name;
this.parents = parents;
@@ -414,7 +418,7 @@
this.builtin = builtin;
this.otype = otype;
this.dotnet = dotnet;
- this.filename = filename;
+ this.artifact = artifact;
if (interfaces != null)
{
@@ -452,12 +456,13 @@
{
this.processed = true;
this.name = qname;
- this.filename = ConversionData.findClassFilename(qname);
+ this.artifact = ArtifactManager.addArtifact(ConversionData.findClassFilename(qname));
// load the root AST and load the following:
// parents (1 for class, 1-n for iface)
// interfaces (0-n only for class)
- Aast root = AstManager.get().loadTree(filename + ".ast");
+ Artifact loadArtifact = ArtifactManager.addArtifact(artifact.getRelativePath() + ".ast");
+ Aast root = AstManager.get().loadTree(loadArtifact);
// get from the root
this.dotnet = Boolean.TRUE.equals(root.getAnnotation("dotnet-cls"));
@@ -474,7 +479,7 @@
{
this.schemaDict = new SchemaDictionary(null);
this.schemaDict.addScope(false);
- SchemaWorker.loadFromPersistence(schemaDict, filename);
+ SchemaWorker.loadFromPersistence(schemaDict, artifact);
this.javaPackage = (String) root.getAnnotation("pkgname");
this.javaClassName = (String) root.getAnnotation("classname");
@@ -1670,13 +1675,13 @@
}
/**
- * Obtains the filename of the .cls that defined this class/interface.
+ * Obtains the artifact of the .cls that defined this class/interface.
*
- * @return Project relative .cls source file name.
+ * @return Project .cls source artifact.
*/
- public String getFilename()
+ public Artifact getArtifact()
{
- return filename;
+ return artifact;
}
/**
@@ -1761,7 +1766,7 @@
}
/**
- * The method indicates whether this inctance represents a "mock" class definition
+ * The method indicates whether this instance represents a "mock" class definition
* used to resolve symbols during class pre-scan mode in case the class file has not been
* parsed.
*
@@ -1891,7 +1896,14 @@
node.putAnnotation("static", Boolean.valueOf(isStatic));
node.putAnnotation("oo-data-store", DataStoreType.METHOD.toString());
node.putAnnotation("tempidx", Long.valueOf(mTempIdx));
- node.putAnnotation("tempidx-file", this.filename);
+ if (this.artifact != null)
+ {
+ node.putAnnotation("tempidx-file", this.artifact.getRelativePath());
+ }
+ else
+ {
+ node.putAnnotation("tempidx-file", "");
+ }
if (extent != 0)
{
@@ -2066,7 +2078,7 @@
}
node.putAnnotation("tempidx", Long.valueOf(mdat.tempIdx));
- node.putAnnotation("tempidx-file", mdat.container.filename);
+ node.putAnnotation("tempidx-file", mdat.container.artifact.getRelativePath());
node.putAnnotation("found-in-cls", mdat.container.name);
if (mdat.container.builtin)
@@ -2077,7 +2089,7 @@
{
node.putAnnotation("dotnet-cls", true);
}
- node.putAnnotation("found-in-source-file", mdat.container.filename);
+ node.putAnnotation("found-in-source-file", mdat.container.artifact.getRelativePath());
if (mdat.extent != 0)
{
=== modified file 'src/com/goldencode/p2j/uast/FrameAstKey.java'
--- old/src/com/goldencode/p2j/uast/FrameAstKey.java 2020-09-24 17:41:02 +0000
+++ new/src/com/goldencode/p2j/uast/FrameAstKey.java 2025-05-09 07:59:18 +0000
@@ -2,7 +2,7 @@
** Module : FrameAstKey.java
** Abstract : a dedicated key for comparing (shared) frames definitions
**
-** Copyright (c) 2016-2020, Golden Code Development Corporation.
+** Copyright (c) 2016-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- ---------------------------------Description---------------------------------
** 001 OM 20161121 Initial release.
@@ -10,7 +10,10 @@
** 003 CA 20200416 Reduce the memory footprint for incremental conversion.
** 004 CA 20200423 Keep a copy of the AST in memory, to not pin the entire file.
** 005 IAS 20200922 Get rid of possible NPE on serialization.
+** 006 DDF 20250414 Make use of artifacts instead of the filename.
+** DDF 20250424 Renamed getTreeName() to getTreeArtifact().
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -69,6 +72,8 @@
import static com.goldencode.util.NativeTypeSerializer.*;
import java.io.*;
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.artifacts.ArtifactManager;
import com.goldencode.ast.*;
import com.goldencode.p2j.pattern.*;
@@ -258,7 +263,9 @@
{
AstManager mgr = AstManager.get();
long treeId = mgr.getTreeId(astId);
- Aast tree = mgr.loadTree(mgr.getTreeName(treeId) + ".ast");
+ Artifact artifact = ArtifactManager.addArtifact(mgr.getTreeArtifact(treeId).getRelativePath() +
+ ".ast");
+ Aast tree = mgr.loadTree(artifact);
resolver.registerTree(tree);
ast = resolver.getAst(astId);
resolver.deregisterTree(tree);
=== modified file 'src/com/goldencode/p2j/uast/JavaClassDefinition.java'
--- old/src/com/goldencode/p2j/uast/JavaClassDefinition.java 2025-03-25 15:07:52 +0000
+++ new/src/com/goldencode/p2j/uast/JavaClassDefinition.java 2025-05-09 07:59:18 +0000
@@ -26,6 +26,7 @@
** 009 CA 20250319 A provisional class var found during pre-scan, which is referenced before the definition
** statement and is referenced via a chain, must be resolved even if is provisional - this is
** the only case allowed in 4GL, when a var can be defined after it is referenced.
+** 010 DDF 20250408 Replace usage of cls.getName() with null, the value is not used.
*/
/*
@@ -112,7 +113,7 @@
*/
public JavaClassDefinition(Class cls)
{
- super(cls.getName(), null, null, false, decodeOOType(cls), false, cls.getName());
+ super(cls.getName(), null, null, false, decodeOOType(cls), false, null);
this.cls = cls;
}
=== modified file 'src/com/goldencode/p2j/uast/JavaPatternWorker.java'
--- old/src/com/goldencode/p2j/uast/JavaPatternWorker.java 2022-10-28 10:54:33 +0000
+++ new/src/com/goldencode/p2j/uast/JavaPatternWorker.java 2025-05-09 07:59:18 +0000
@@ -2,7 +2,7 @@
** Module : JavaPatternWorker.java
** Abstract : Pattern worker with specific knowledge of the Java language
**
-** Copyright (c) 2005-2022, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
** 001 GES 20050324 @20599 Created initial version. Provides Java AST
@@ -52,7 +52,11 @@
** All worker's state must be context-local, for runtime conversion to work in
** multi-context mode, as the pattern workers are singletons.
** TJD 20220504 Java 11 compatibility minor changes
+** 019 DDF 20250320 Replace usage Setnull.
*
* @return The root AST that was created or null on error.
*/
- public static JavaAst createRootAst(File file, AstSymbolResolver resolver)
+ public static JavaAst createRootAst(Artifact artifact, AstSymbolResolver resolver)
{
JavaAst result = createAst(COMPILE_UNIT,
"compilation unit",
null,
null,
-1);
- initializeRootAst(result, file, resolver);
+ initializeRootAst(result, artifact, resolver);
return result;
}
/**
- * Worker routine to centralize creation of a new Java AST that is a root node. A new file ID
- * is registered in the {@link AstManager} and set into the AST.
- *
- * @param filename
- * The name of the file in which to persist the new AST. Can be real or virtual (i.e.
- * the file can be never persisted into the file system, the name is used to map some
- * ID to the AST).
- * @param resolver
- * The current instance of the {@link AstSymbolResolver} in use
- * or null.
- *
- * @return The root AST that was created or null on error.
- */
- public static JavaAst createRootAst(String filename, AstSymbolResolver resolver)
- {
- JavaAst result = createAst(COMPILE_UNIT,
- "compilation unit",
- null,
- null,
- -1);
- initializeRootAst(result, filename, resolver);
-
- return result;
- }
-
- /**
* Generate a unique Java AST persistence filename based on the passed
- * filename.
- *
- * @param filename
- * The filename used as a base for the Java AST filename.
- *
- * @return A unique filename based on the source filename with '.jast'
+ * artifact.
+ *
+ * @param artifact
+ * The artifact used as a base for the Java AST filename.
+ *
+ * @return A unique artifact based on the source artifact with '.jast'
* appended.
*/
- public static String generateJavaFilename(String filename)
+ public static Artifact generateJavaArtifact(Artifact artifact)
{
- if (filename.endsWith(JAST_POSTFIX))
+ if (artifact.endsWith(JAST_POSTFIX))
{
- return filename;
+ return artifact;
}
- StringBuilder sb = new StringBuilder(filename);
+ StringBuilder sb = new StringBuilder(artifact.getRelativePath());
- return sb.append(JAST_POSTFIX).toString();
+ return ArtifactManager.addArtifact(sb.append(JAST_POSTFIX).toString());
}
/**
* Clears past contents of the new files list and enables tracking mode
* where all JAST files that are persisted are logged in a set that
- * can be queried by {@link #getPersistedFiles}. Use
+ * can be queried by {@link #getPersistedArtifacts()}. Use
* {@link #disableNewFileTracking} when the tracking session is no
* longer needed.
*/
public static void enableNewFileTracking()
{
WorkArea wa = context.get();
- wa.pfiles = new HashSet<>();
+ wa.pfiles = new ArtifactCollection();
wa.track = true;
}
/**
* Disables tracking mode such that any JAST files that are persisted
* will no longer be logged in the set that can be queried by
- * {@link #getPersistedFiles}. Does not alter the contents of the current
+ * {@link #getPersistedArtifacts()}. Does not alter the contents of the current
* persisted files list. Use this to finish a session started with
* {@link #enableNewFileTracking}
*/
@@ -322,15 +304,15 @@
}
/**
- * Accesses the list of files persisted since the last call
+ * Accesses the collection of artifacts with files persisted since the last call
* to {@link #enableNewFileTracking}. There are no duplicate entries in
* the list.
*
- * @return The list of files that have been recently persisted.
+ * @return The collection of artifacts with files that have been recently persisted.
*/
- public static String[] getPersistedFiles()
+ public static ArtifactCollection getPersistedArtifacts()
{
- return (String[]) context.get().pfiles.toArray(new String[0]);
+ return context.get().pfiles;
}
/**
@@ -386,19 +368,18 @@
if (wa.autoload)
{
- String filename = generateJavaFilename(ast);
- filename = Configuration.normalizeFilename(filename);
+ Artifact artifact = generateJavaArtifact(ast);
try
{
- if (AstManager.get().isExistingAst(filename))
+ if (AstManager.get().isExistingAst(artifact))
{
- helper.loadJavaFile(filename, true);
+ helper.loadJavaFile(artifact, true);
}
else
{
// create a new target tree
- wa.root = wa.current = createRootAst(new File(filename), getResolver());
+ wa.root = wa.current = createRootAst(artifact, getResolver());
}
}
@@ -410,16 +391,16 @@
}
/**
- * Generate a unique Java AST persistence filename based on the current
- * source AST filename.
+ * Generate a unique Java AST persistence artifact based on the current
+ * source AST artifact.
*
- * @return A unique filename based on the source filename with '.jast'
+ * @return A unique artifact based on the source artifact with '.jast'
* appended.
*/
- private String generateJavaFilename(Aast ast)
+ private Artifact generateJavaArtifact(Aast ast)
{
- return generateJavaFilename(ast.getFilename());
- }
+ return generateJavaArtifact(ast.getArtifact());
+ }
/**
* Helper to create, edit, move and delete Java ASTs.
@@ -892,16 +873,16 @@
* Any changes made during processing of the previous AST will be lost
* if they haven't been persisted by this point.
*
- * @param filename
- * The filename to use as the Java AST filename.
+ * @param artifact
+ * The artifact to use as the Java AST filename.
* @param projectRelative
- * true if the filename is relative to the
- * project home directory, false if the filename
+ * true if the artifact filename is relative to the
+ * project home directory, false if the artifact filename
* is absolute or relative to the current directory.
*/
- public boolean createJavaFile(String filename, boolean projectRelative)
+ public boolean createJavaFile(Artifact artifact, boolean projectRelative)
{
- return createJavaFile(filename, projectRelative, false);
+ return createJavaFile(artifact, projectRelative, false);
}
/**
@@ -911,13 +892,13 @@
* Any changes made during processing of the previous AST will be lost
* if they haven't been persisted by this point.
*
- * @param filename
- * The filename to use as the Java AST filename.
+ * @param artifact
+ * The artifact to use as the Java AST filename.
*/
- public JavaAst createJavaFile(String filename)
+ public JavaAst createJavaFile(Artifact artifact)
{
JavaAst result = createAst(COMPILE_UNIT, "compilation unit", null, null, -1);
- result.brainwash(filename);
+ result.brainwash(artifact);
return result;
}
@@ -929,8 +910,8 @@
* Any changes made during processing of the previous AST will be lost
* if they haven't been persisted by this point.
*
- * @param filename
- * The filename to use as the Java AST filename.
+ * @param artifact
+ * The artifact to use as the Java AST artifact.
* @param projectRelative
* true if the filename is relative to the
* project home directory, false if the filename
@@ -939,34 +920,14 @@
* If true then the file is not supposed to be persisted into the file
* system, the file name is used to map some ID to the AST.
*/
- public boolean createJavaFile(String filename, boolean projectRelative, boolean virtualFile)
+ public boolean createJavaFile(Artifact artifact, boolean projectRelative, boolean virtualFile)
{
WorkArea wa = context.get();
try
{
- if (virtualFile)
- {
- wa.root = wa.current = createRootAst(filename, getResolver());
- }
- else
- {
- File file;
-
- if (projectRelative)
- {
- file = Configuration.toFile(filename);
- }
- else
- {
- file = new File(filename);
- }
-
- // create a new target tree
- wa.root = wa.current = createRootAst(file, getResolver());
- }
+ wa.root = wa.current = createRootAst(artifact, getResolver());
}
-
catch (Exception exc)
{
// some failure, we just won't have a Java AST!
@@ -983,28 +944,23 @@
* Any changes made during processing of the previous AST will be lost
* if they haven't been persisted by this point.
*
- * @param filename
- * The filename from which to read the Java AST.
+ * @param artifact
+ * The artifact from which to read the Java AST.
* @param projectRelative
* true if the filename is relative to the
* project home directory, false if the filename
* is absolute or relative to the current directory.
*/
- public boolean loadJavaFile(String filename, boolean projectRelative)
+ public boolean loadJavaFile(Artifact artifact, boolean projectRelative)
{
WorkArea wa = context.get();
try
{
- if (projectRelative)
- {
- filename = Configuration.normalizeFilename(filename);
- }
-
- if (AstManager.get().isExistingAst(filename))
+ if (AstManager.get().isExistingAst(artifact))
{
// read the existing target tree
- wa.root = wa.current = (JavaAst) AstManager.get().loadTree(filename);
+ wa.root = wa.current = (JavaAst) AstManager.get().loadTree(artifact);
// set the current Java target AST into the resolver
getResolver().setTargetRootAst(wa.root);
@@ -1054,7 +1010,7 @@
AstException,
IOException
{
- return persistJavaFile(getSource().getFilename());
+ return persistJavaFile(getSource().getArtifact());
}
/**
@@ -1078,7 +1034,7 @@
AstException,
IOException
{
- return persistJavaAst(ast.getFilename(), ast);
+ return persistJavaAst(ast.getArtifact(), ast);
}
/**
@@ -1086,8 +1042,8 @@
* child). If this AST is empty, it will be removed from the {@link AstManager} which will
* essentially disable further use of this AST.
*
- * @param filename
- * Base filename (without jast extension) under which to save the
+ * @param artifact
+ * Artifact (without jast extension) under which to save the
* Java AST. Must be an absolute path or relative to the project root.
* @param ast
* The AST to be persisted.
@@ -1100,14 +1056,12 @@
* @throws AstException
* if there is an error writing Java AST.
*/
- public boolean persistJavaAst(String filename, JavaAst ast)
+ public boolean persistJavaAst(Artifact artifact, JavaAst ast)
throws ConfigurationException,
AstException,
IOException
{
WorkArea wa = context.get();
-
- filename = Configuration.normalizeFilename(filename);
// bypass persistence if there is an empty tree
if (ast.getNumImmediateChildren() == 0)
@@ -1115,7 +1069,7 @@
try
{
// no need to maintain this value in the registry
- AstManager.get().removeTree(filename);
+ AstManager.get().removeTree(artifact);
}
catch (Exception exc)
{
@@ -1126,12 +1080,12 @@
}
// read the existing target tree
- AstManager.get().saveTree(ast, filename, false);
+ AstManager.get().saveTree(ast, artifact, false);
// save this into the list of new files if tracking is enabled
if (wa.track)
{
- wa.pfiles.add(filename);
+ wa.pfiles.add(artifact);
}
return true;
@@ -1143,8 +1097,8 @@
* removed from the {@link AstManager} which will essentially disable
* further use of this AST.
*
- * @param filename
- * Base filename (without jast extension) under
+ * @param artifact
+ * Artifact (without jast extension) under
* which to save the Java AST. Must be an absolute path or
* relative to the project root.
*
@@ -1157,14 +1111,14 @@
* @throws AstException
* if there is an error writing Java AST.
*/
- public boolean persistJavaFile(String filename)
+ public boolean persistJavaFile(Artifact artifact)
throws ConfigurationException,
AstException,
IOException
{
- filename = generateJavaFilename(filename);
+ artifact = generateJavaArtifact(artifact);
- return persistJavaAst(filename, context.get().root);
+ return persistJavaAst(artifact, context.get().root);
}
}
@@ -1173,8 +1127,8 @@
*/
private static class WorkArea
{
- /** The list of persisted files between 2 arbitrary points in time. */
- private Settrue if persisted file names must be tracked. */
private boolean track = false;
@@ -1191,4 +1145,4 @@
/** Root of the target tree currently being processed. */
private JavaAst root = null;
}
-}
\ No newline at end of file
+}
=== modified file 'src/com/goldencode/p2j/uast/LexerDumpFilter.java'
--- old/src/com/goldencode/p2j/uast/LexerDumpFilter.java 2022-10-28 10:54:33 +0000
+++ new/src/com/goldencode/p2j/uast/LexerDumpFilter.java 2025-05-09 07:59:18 +0000
@@ -2,7 +2,7 @@
** Module : LexerDumpFilter.java
** Abstract : wraps a lexer token stream, acting as a filter this writes the tokens to file
**
-** Copyright (c) 2004-2022, Golden Code Development Corporation.
+** Copyright (c) 2004-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- ---------------------------Description----------------------------
** 001 GES 20050221 @19919 First version, with support for:
@@ -24,7 +24,9 @@
** exception. We also see this problem at times when there is no
** exception and this may also solve that issue.
** 007 TJD 20220504 Java 11 compatibility minor changes
-*/
+** 008 DDF 20250407 Added new constructors that use SourceArtifact.
+*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -80,6 +82,7 @@
package com.goldencode.p2j.uast;
+import com.goldencode.artifacts.SourceArtifact;
import com.goldencode.util.*;
import java.io.*;
import java.text.*;
@@ -186,6 +189,48 @@
}
/**
+ * Constructs a lexer using an artifact as input and associating a
+ * SymbolResolver with the instance, will open an output
+ * stream using the passed File object. User must call
+ * {@link #setOutput} before starting to lex, otherwise no output
+ * will be created.
+ *
+ * @param artifact
+ * The artifact representing the Progress 4GL source code.
+ * @param sr
+ * Provides keyword dictionary storage and lookup for symbol
+ * resolution in the lexer.
+ */
+ public LexerDumpFilter(SourceArtifact artifact, SymbolResolver sr)
+ throws IllegalArgumentException,
+ IOException
+ {
+ super(artifact, sr);
+ initialize();
+ }
+
+ /**
+ * Constructs a lexer using an artifact as input and associating a
+ * SymbolResolver with the instance, will open an output
+ * stream using the passed File object.
+ *
+ * @param artifact
+ * The artifact representing the Progress 4GL source code.
+ * @param sr
+ * Provides keyword dictionary storage and lookup for symbol
+ * resolution in the lexer.
+ * @param file
+ * The output file to which the tokens will be written.
+ */
+ public LexerDumpFilter(SourceArtifact artifact, SymbolResolver sr, File file)
+ throws IllegalArgumentException,
+ IOException
+ {
+ this(artifact, sr);
+ openOutput(file);
+ }
+
+ /**
* This is the main filter point which calls the parent lexer, obtains
* the next token, writes it to the output file and then returns it to
* the caller.
=== modified file 'src/com/goldencode/p2j/uast/RootNodeList.java'
--- old/src/com/goldencode/p2j/uast/RootNodeList.java 2018-11-28 10:06:31 +0000
+++ new/src/com/goldencode/p2j/uast/RootNodeList.java 2025-05-09 07:59:18 +0000
@@ -2,7 +2,7 @@
** Module : RootNodeList.java
** Abstract : maintains a project-specific list of root entry point procedures
**
-** Copyright (c) 2005-2018, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- -----------------------------Description-----------------------------
** 001 GES 20050314 @20312 Created initial version which has support
@@ -18,7 +18,10 @@
** 008 GES 20170531 Fix loading when current directory is not the same as project home.
** 009 CA 20170922 Fixed a path compatibility when generating the callgraph on windows.
** 010 CA 20181128 Fixed rootlist file calculation when folders are used.
+** 011 GES 20230524 Moved some code to a more generic package.
+** DDF 20250327 Replaced usage of FileSpecList with ArtifactCollection.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -77,6 +80,8 @@
import java.io.*;
import java.util.*;
import org.w3c.dom.*;
+
+import com.goldencode.artifacts.*;
import com.goldencode.ast.*;
import com.goldencode.util.*;
import com.goldencode.p2j.cfg.*;
@@ -116,8 +121,8 @@
/** XML filename for persisting the registry. */
private File file = null;
- /** Stores the root node list. */
- private ArrayListnull.
- * @param silent
- * false if screen (stdout) output should be done.
- * If true, normal screen output is suppressed and
- * the only output occurs on failures (this is written to
- * stderr).
- *
- * @throws Exception
- * in the event abortOnError is true and a failure occurs.
- */
- public static void scan(FileList files, boolean silent)
- throws Exception
- {
- // scan with default thread pool
- scan(files, silent, false, 1);
+ public static boolean removeSource(Artifact artifact)
+ {
+ return removedConversionFiles.add(artifact);
}
/**
@@ -309,10 +287,10 @@
* @throws Exception
* in the event abortOnError is true and a failure occurs.
*/
- public static void scan(FileList files, boolean silent, boolean abortOnError, int threads)
+ public static void scan(ArtifactCollection col, boolean silent, boolean abortOnError, int threads)
throws Exception
{
- scan(files, true, true, true, true, true, silent, abortOnError, threads);
+ scan(col, true, true, true, true, true, silent, abortOnError, threads);
}
/**
@@ -350,7 +328,7 @@
* @throws Exception
* in the event abortOnError is true and a failure occurs.
*/
- public static void scan(FileList files,
+ public static void scan(ArtifactCollection artifacts,
boolean preproc,
boolean cache,
boolean lex,
@@ -361,31 +339,13 @@
int threads)
throws Exception
{
- // setup
- File[] list = files.list();
-
- Set
- * java ScanDriver [-QCLPXSANR] <directory> <"filespec">
- * java ScanDriver -F[QCLPXSA] <"filelist">
- *
- * Where:
- *
- *
- *
- *
- *
- *
- *
- *
- * .cls files represent the
* Progress built-ins and all .NET classes/interfaces that can be accessed.
* .cls files, in the same case in which
+ * @return The collection of artifacts for .cls files, in the same case in which
* they exist in the filesystem.
*/
- public static String[] listFakeoutFiles()
+ public static ArtifactCollection listFakeoutArtifacts()
{
- String[] oo4gl = getClassFileList(oo4glPath, false);
- String[] dotnet = getClassFileList(dotnetPath, false);
- String[] assembly = getClassFileList(ASSEMBLY_PATH, false);
-
- ArrayListtrue if the legacy system had a case-sensitive
* file-system.
*
- * @return The list of files that exist. If there are no files, the
- * array will have a 0 length.
+ * @return The collection of artifacts for files that exist. If there are no files, the
+ * collection will be empty.
*/
- public static String[] getClassFileList(String path, boolean caseSens)
+ public static ArtifactCollection getClassFileList(String path, boolean caseSens)
{
File dir = new File(path);
if (!dir.exists() || !dir.isDirectory())
{
- return new String[0];
+ return new ArtifactCollection();
}
String absPath = null;
@@ -2470,22 +2472,18 @@
LOG.log(Level.SEVERE, "", exc);
}
- String[] files = DIR_CLASSES.get(absPath);
- if (files == null)
+ ArtifactCollection artifacts = DIR_CLASSES.get(absPath);
+ if (artifacts == null)
{
- FileList fl = new FileSpecList(dir, CLASS_SPLAT, true, caseSens);
-
- files = fl.listFilenames();
- for (int i = 0; i < files.length; i++)
- {
- String l = files[i];
- l = Configuration.normalizeFilename(l);
- files[i] = l;
- }
- DIR_CLASSES.put(absPath, files);
+ artifacts = ArtifactManager.createArtifactsByFileList(FileSpecList.class,
+ dir,
+ CLASS_SPLAT,
+ true,
+ caseSens);
+ DIR_CLASSES.put(absPath, artifacts);
}
- return files;
+ return artifacts;
}
/**
@@ -2495,7 +2493,7 @@
*
* @param map
* The map to modify.
- * @param list
+ * @param col
* The elements to add.
* @param path
* The root path in which all elements reside.
@@ -2503,11 +2501,16 @@
* true if the legacy system had a case-sensitive
* file-system.
*/
- public static void createClassMappings(Mapnull if none exist.
- * @param file
- * The filename of the .cls that defined this class.
+ * @param artifact
+ * The artifact of the .cls that defined this class.
*/
- public void addClass(Aast symbol, Aast inherits, Aast imple, String file)
+ public void addClass(Aast symbol, Aast inherits, Aast imple, Artifact artifact)
{
String name = symbol.getText();
@@ -4246,7 +4260,7 @@
ifaces = calculateParents(name, imple, found.dotnet);
}
- addClass(name, parents, ifaces, found.builtin, found.dotnet, file);
+ addClass(name, parents, ifaces, found.builtin, found.dotnet, artifact);
}
/**
@@ -4266,15 +4280,15 @@
* true if this definition is built-in to Progress.
* @param dotnet
* true if this definition is a .NET class.
- * @param file
- * The filename of the .cls that defined this class.
+ * @param artifact
+ * The artifact of the .cls that defined this class.
*/
public void addClass(String name,
ClassDefinition[] parents,
ClassDefinition[] ifaces,
boolean builtin,
boolean dotnet,
- String file)
+ Artifact artifact)
{
WorkArea wa = locate();
@@ -4283,12 +4297,12 @@
if (!loaded)
{
- cls = new ClassDefinition(name, parents, ifaces, builtin, OOType.CLASS, dotnet, file);
+ cls = new ClassDefinition(name, parents, ifaces, builtin, OOType.CLASS, dotnet, artifact);
}
while (parents != null)
{
- SchemaWorker.loadFromPersistence(schemaDict, parents[0].getFilename());
+ SchemaWorker.loadFromPersistence(schemaDict, parents[0].getArtifact());
// classes can only inherit from 1 parent and it must also be a class
// so we can hard code to the first array element
@@ -4322,17 +4336,17 @@
* name.
* @param inherits
* Optional inherits clause.
- * @param file
- * The filename of the .cls that defined this interface.
+ * @param artifact
+ * The artifact of the .cls that defined this interface.
*/
- public void addInterface(Aast symbol, Aast inherits, String file)
+ public void addInterface(Aast symbol, Aast inherits, Artifact artifact)
{
String name = symbol.getText();
SearchResult found = resolveClassName(name);
// all interfaces inherit methods from Progress.Lang.Object
ClassDefinition[] parents = calculateParents(name, inherits, found.dotnet);
- addInterface(name, parents, found.builtin, found.dotnet, file);
+ addInterface(name, parents, found.builtin, found.dotnet, artifact);
}
/**
@@ -4349,14 +4363,14 @@
* true if this definition is built-in to Progress.
* @param dotnet
* true if this definition is a .NET class.
- * @param file
- * The filename of the .cls that defined this interface.
+ * @param artifact
+ * The artifact of the .cls that defined this interface.
*/
public void addInterface(String name,
ClassDefinition[] parents,
boolean builtin,
boolean dotnet,
- String file)
+ Artifact artifact)
{
WorkArea wa = locate();
if (wa.preScanPass == 0)
@@ -4375,7 +4389,7 @@
builtin,
OOType.INTERFACE,
dotnet,
- file);
+ artifact);
}
// remember this is the interface definition being updated (with
@@ -4400,10 +4414,10 @@
* name.
* @param flags
* {@code true} if this is a flags enum.
- * @param file
- * The filename of the .cls that defined this interface.
+ * @param artifact
+ * The artifact of the .cls that defined this interface.
*/
- public void addEnum(Aast symbol, boolean flags, String file)
+ public void addEnum(Aast symbol, boolean flags, Artifact artifact)
{
String name = symbol.getText();
SearchResult found = resolveClassName(name);
@@ -4450,7 +4464,7 @@
found.builtin,
OOType.ENUM,
found.dotnet,
- file);
+ artifact);
// the 4GL has an undocumented member of all .NET enum instances that returns the integer value of
// that instance; this implicit member does NOT exist for 4GL enums; references will appear in the
@@ -4723,7 +4737,7 @@
// not loaded yet
// do we have a cached file name?
- if (found.filename == null)
+ if (found.artifact == null)
{
// find the class file name in the propath
if (!srchPropathFindFile(found.clsname, found.type, found))
@@ -4762,8 +4776,6 @@
generator.setAstPersist(true);
}
- String relative = Configuration.normalizeFilename(found.filename);
-
if (wa.preScanPass == 0)
{
wa.preScanRefs.clear();
@@ -4783,11 +4795,11 @@
System.out.printf(" Lvl%02d parse:%s%s\n",
wa.preScanPass,
str,
- relative);
+ found.artifact.getRelativePath());
}
// the PROPATH is inherited from the caller
- generator.preScanClass(relative, found.builtin, found.dotnet, this.propath);
+ generator.preScanClass(found.artifact, found.builtin, found.dotnet, this.propath);
// save all referenced classes/interfaces except for the genesis object
if (wa.preScanPass > 1)
@@ -4829,7 +4841,7 @@
if (wa.preScanPass == 0)
{
wa.preScanRefs.clear();
- System.out.println(" Lvl01 DONE: " + relative);
+ System.out.println(" Lvl01 DONE: " + found.artifact.getRelativePath());
}
}
@@ -4840,7 +4852,7 @@
if (cls == null)
{
String spec = "Cannot load class/interface %s from file %s!";
- String err = String.format(spec, found.clsname, relative);
+ String err = String.format(spec, found.clsname, found.artifact.getRelativePath());
throw new RuntimeException(err);
}
@@ -5043,7 +5055,14 @@
}
node.putAnnotation("qualified", cls.isJava() ? qname : qname.toLowerCase());
- node.putAnnotation("source-file", cls.getFilename());
+ if (cls.getArtifact() != null)
+ {
+ node.putAnnotation("source-file", cls.getArtifact().getRelativePath());
+ }
+ else
+ {
+ node.putAnnotation("source-file", cls.getName());
+ }
node.putAnnotation("builtin-cls", cls.isBuiltIn());
node.putAnnotation("dotnet-cls", cls.isDotNet());
node.putAnnotation("indirect-dotnet", cls.isIndirectDotNetReference());
@@ -5303,8 +5322,8 @@
* used to match unqualified class names with their fully qualified
* equivalents.
*
- * @param filename
- * The file where this USING statement appears.
+ * @param artifact
+ * The artifact where this USING statement appears.
* @param using
* The USING node.
* @param name
@@ -5315,7 +5334,7 @@
* clause or null if it wasn't present. A Java package will
* only be processed if explicitly specified (non-null FROM JAVA clause).
*/
- public void addPackage(String filename, Aast using, String name, Aast fromClause)
+ public void addPackage(Artifact artifact, Aast using, String name, Aast fromClause)
{
UsingType type = UsingType.UNSPECIFIED;
@@ -5409,14 +5428,14 @@
// if we are not 'using' the same class as the current class being defined
SearchResult found = resolveClassName(name, type);
- String relative = (found == null || found.filename == null || found.java)
+ String relative = (found == null || found.artifact == null || found.java)
? null
- : Configuration.normalizeFilename(found.filename);
+ : Configuration.normalizeFilename(found.artifact.getRelativePath());
WorkArea wa = locate();
// take a peek at the preScanRefs searching a class we are already parsing
- if ((relative == null || !filename.equalsIgnoreCase(relative)) &&
+ if ((relative == null || !artifact.getRelativePath().equalsIgnoreCase(relative)) &&
!(wa.preScanRefs.contains(found.clsname)))
{
if (name == null)
@@ -5431,7 +5450,7 @@
else
{
using.putAnnotation("qualified", found.java ? name : name.toLowerCase());
- using.putAnnotation("source-file", filename);
+ using.putAnnotation("source-file", artifact.getRelativePath());
using.putAnnotation("builtin-cls", found.builtin);
using.putAnnotation("dotnet-cls", found.dotnet);
using.putAnnotation("is-java", found.java);
@@ -8940,11 +8959,11 @@
cdef.setProcessed(true);
- String file = cdef.getFilename();
+ Artifact artifact = cdef.getArtifact();
- if (!cdef.isBuiltIn() && new File(file).exists())
+ if (!cdef.isBuiltIn() && artifact.exists())
{
- generator.processFile(file, null, -1);
+ generator.processFile(artifact, null, -1);
// at this point we have been fully parsed and all parents have been fully parsed, so
// it is safe to detect whether or not one of our ancestors is a .NET class
@@ -9113,7 +9132,7 @@
* will be lowercased.
*
* @param propathCls
- * The map to store the classes.
+ * The map to store the artifacts for classes.
* @param propath
* The propath to scan for initialization. The propath can change
* with each instantiation of this class. If it changes then
@@ -9123,9 +9142,9 @@
* true if the legacy system had a case-sensitive
* file-system.
*/
- private static synchronized ScopedSymbolDictionary initPossibleClasses(Maptrue if fields should be scoped to the default buffer. This is used in FORM
* and DEFINE FRAME for unqualified lookups of fields.
@@ -5942,6 +5948,7 @@
// setup our resolver
sym = sr;
+ artifact = ((ProgressLexer) lexer).getArtifact();
initializeProcedureDictionary();
initializeStreamDictionary();
initializeFunctionDictionary();
@@ -5953,6 +5960,33 @@
// set the AST class
astFactory.setASTNodeClass(AST_CLASS);
}
+
+ /**
+ * Gets the filename of the artifact. If there is no artifact available, it will
+ * default to the original method.
+ *
+ * @return The filename of the artifact.
+ */
+ @Override
+ public String getFilename()
+ {
+ if (artifact != null)
+ {
+ return artifact.getRelativePath();
+ }
+
+ return super.getFilename();
+ }
+
+ /**
+ * Used to retrieve the artifact.
+ *
+ * @return The artifact.
+ */
+ public SourceArtifact getArtifact()
+ {
+ return artifact;
+ }
/**
* Writes error data to logger, including a full stack trace.
@@ -11449,7 +11483,8 @@
SymbolResolver sym = new SymbolResolver(true);
FileReader fr = new FileReader(fname);
BufferedReader br = new BufferedReader(fr);
- ProgressLexer lexer = new ProgressLexer(br, sym);
+ SourceArtifact artifact = ArtifactManager.addLexerArtifact(fname, br);
+ ProgressLexer lexer = new ProgressLexer(artifact, sym);
ProgressParser parser = new ProgressParser(lexer, sym);
// parse the input file and create a tree
@@ -12565,7 +12600,7 @@
block_term
)
{
- sym.addClass(#s, #inher, #impl, getFilename());
+ sym.addClass(#s, #inher, #impl, getArtifact());
builtInCls = sym.isBuiltInClass(#s.getText());
dotNetCls = sym.isDotNetClass(#s.getText());
@@ -12706,7 +12741,7 @@
(inher:multiple_inherits_clause)? block_term
)
{
- sym.addInterface(#s, #inher, getFilename());
+ sym.addInterface(#s, #inher, getArtifact());
builtInCls = sym.isBuiltInClass(#s.getText());
dotNetCls = sym.isDotNetClass(#s.getText());
@@ -12809,7 +12844,7 @@
(f:KW_FLAGS)? block_term
)
{
- sym.addEnum(#s, (#f != null), getFilename());
+ sym.addEnum(#s, (#f != null), getArtifact());
builtInCls = sym.isBuiltInClass(#s.getText());
dotNetCls = sym.isDotNetClass(#s.getText());
@@ -13039,7 +13074,7 @@
}
}
- sym.addPackage(getFilename(), #u, sb.toString(), #f);
+ sym.addPackage(getArtifact(), #u, sb.toString(), #f);
if (preScanPass == 0)
{
@@ -34799,6 +34834,9 @@
*/
private SymbolResolver sym = null;
+ /** The associated artifact. */
+ private SourceArtifact artifact = null;
+
/**
* Creates a Keyword array and initializes that array to
* the list of all recognized Progress 4GL language keywords. The
@@ -37446,6 +37484,44 @@
initializeKeywordDictionary();
readCfg();
}
+
+ /**
+ * Constructs a lexer using an artifact as input and associating a
+ * SymbolResolver with the instance. The artifact reader will be
+ * wrapped in a {@link DotKludgeReader} instance.
+ *
+ * @param ar
+ * The artifact representing the Progress 4GL source code.
+ * @param sr
+ * Provides keyword dictionary storage and lookup for symbol
+ * resolution in the lexer.
+ */
+ public ProgressLexer(SourceArtifact ar, SymbolResolver sr)
+ {
+ this(ar, sr, true);
+ }
+
+ /**
+ * Constructs a lexer using an artifact as input and associating a
+ * SymbolResolver with the instance.
+ *
+ * @param ar
+ * The artifact representing the Progress 4GL source code.
+ * @param sr
+ * Provides keyword dictionary storage and lookup for symbol
+ * resolution in the lexer.
+ * @param kludge
+ * true to force the artifact reader to be wrapped in a
+ * {@link DotKludgeReader} instance.
+ */
+ public ProgressLexer(SourceArtifact ar, SymbolResolver sr, boolean kludge)
+ {
+ this(new CharBuffer(kludge ? new DotKludgeReader(ar.getReader()) : ar.getReader()));
+ artifact = ar;
+ sym = sr;
+ initializeKeywordDictionary();
+ readCfg();
+ }
/**
* Constructs a lexer using stream as input and associating a
@@ -37458,7 +37534,7 @@
* Provides keyword dictionary storage and lookup for symbol
* resolution in the lexer.
*/
- public ProgressLexer(InputStream in, SymbolResolver sr)
+ public ProgressLexer(InputStream in, SymbolResolver sr)
{
this(in, sr, true);
}
@@ -37476,13 +37552,40 @@
* true to force the stream to be wrapped in a
* {@link DotKludgeStream} instance.
*/
- public ProgressLexer(InputStream in, SymbolResolver sr, boolean kludge)
+ public ProgressLexer(InputStream in, SymbolResolver sr, boolean kludge)
{
this(new ByteBuffer(kludge ? new DotKludgeStream(in) : in));
sym = sr;
initializeKeywordDictionary();
readCfg();
}
+
+ /**
+ * Gets the filename of the artifact. If there is no artifact available, it will
+ * default to the original method.
+ *
+ * @return The filename of the artifact.
+ */
+ @Override
+ public String getFilename()
+ {
+ if (artifact != null)
+ {
+ return artifact.getRelativePath();
+ }
+
+ return super.getFilename();
+ }
+
+ /**
+ * Used to retrieve the artifact.
+ *
+ * @return The artifact.
+ */
+ public SourceArtifact getArtifact()
+ {
+ return artifact;
+ }
/**
* Initialize configuration values.
=== modified file 'src/com/goldencode/p2j/xml/XmlPatternWorker.java'
--- old/src/com/goldencode/p2j/xml/XmlPatternWorker.java 2023-05-12 10:05:12 +0000
+++ new/src/com/goldencode/p2j/xml/XmlPatternWorker.java 2025-05-09 07:59:18 +0000
@@ -2,7 +2,7 @@
** Module : XmlPatternWorker.java
** Abstract : Pattern worker which assists with XML AST processing
**
-** Copyright (c) 2005-2023, Golden Code Development Corporation.
+** Copyright (c) 2005-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- --------------------------- Description ---------------------------
** 001 ECF 20050608 @21459 Created initial version. Provides a callback
@@ -31,7 +31,9 @@
** 014 CA 20150406 Fixed makeSystemID, when the URL protocol is "file".
** 015 CA 20200412 Added incremental conversion support.
** 016 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
+** 017 DDF 20250414 Make use of artifacts instead of the filename.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -93,6 +95,8 @@
import java.util.*;
import javax.xml.parsers.*;
+import com.goldencode.artifacts.Artifact;
+import com.goldencode.artifacts.ArtifactManager;
import com.goldencode.p2j.util.logging.*;
import org.w3c.dom.*;
import com.goldencode.ast.*;
@@ -332,7 +336,8 @@
{
try
{
- AstManager.get().saveTree(root, filename + ".xast", false);
+ Artifact artifact = ArtifactManager.addArtifact(filename + ".xast");
+ AstManager.get().saveTree(root, artifact, false);
}
catch (AstException exc)
{
=== modified file 'src/com/goldencode/trpl/Driver.java'
--- old/src/com/goldencode/trpl/Driver.java 2023-05-12 10:05:12 +0000
+++ new/src/com/goldencode/trpl/Driver.java 2025-05-09 07:59:18 +0000
@@ -2,13 +2,15 @@
** Module : Driver.java
** Abstract : thread which processes trees obtained from a queue of tree names
**
-** Copyright (c) 2009-2023, Golden Code Development Corporation.
+** Copyright (c) 2009-2025, Golden Code Development Corporation.
**
** -#- -I- --Date-- --JPRM-- ----------------Description-----------------
** 001 GES 20090525 @42533 Thread which processes trees obtained from a queue
** of tree names.
** 002 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
+** 003 DDF 20250414 Make use of artifacts instead of the filename.
*/
+
/*
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Affero General Public License as
@@ -68,6 +70,7 @@
import java.util.concurrent.*;
import java.util.logging.*;
+import com.goldencode.artifacts.Artifact;
import com.goldencode.ast.*;
import com.goldencode.p2j.convert.*;
@@ -80,8 +83,8 @@
/** Logger */
private static final ConversionStatus LOG = ConversionStatus.get(Driver.class);
- /** Queue from which to obtain the next tree name to process. */
- private final ConcurrentLinkedQueue