From eee46c2189a3e15a89a5325573c512d216b0976e Mon Sep 17 00:00:00 2001 From: Maximilian Kaul Date: Mon, 2 Dec 2024 15:30:25 +0100 Subject: [PATCH] fix package name and enable ini in console and neo4j (#1879) --- .../kotlin/de/fraunhofer/aisec/cpg/console/TranslatePlugin.kt | 1 + .../{frontend/configfiles => frontends/ini}/IniFileFrontend.kt | 2 +- .../{frontend/configfiles => frontends/ini}/IniFileLanguage.kt | 2 +- .../cpg/{frontend/configfiles => frontends/ini}/IniFileTest.kt | 2 +- .../kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) rename cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/{frontend/configfiles => frontends/ini}/IniFileFrontend.kt (99%) rename cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/{frontend/configfiles => frontends/ini}/IniFileLanguage.kt (97%) rename cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/{frontend/configfiles => frontends/ini}/IniFileTest.kt (98%) diff --git a/cpg-console/src/main/kotlin/de/fraunhofer/aisec/cpg/console/TranslatePlugin.kt b/cpg-console/src/main/kotlin/de/fraunhofer/aisec/cpg/console/TranslatePlugin.kt index dd9230af42..b44330dbf8 100644 --- a/cpg-console/src/main/kotlin/de/fraunhofer/aisec/cpg/console/TranslatePlugin.kt +++ b/cpg-console/src/main/kotlin/de/fraunhofer/aisec/cpg/console/TranslatePlugin.kt @@ -78,6 +78,7 @@ class TranslatePlugin : Plugin { " .optionalLanguage(\"de.fraunhofer.aisec.cpg.frontends.golang.GoLanguage\")" + " .optionalLanguage(\"de.fraunhofer.aisec.cpg.frontends.typescript.TypeScriptLanguage\")" + " .optionalLanguage(\"de.fraunhofer.aisec.cpg.frontends.ruby.RubyLanguage\")" + + " .optionalLanguage(\"de.fraunhofer.aisec.cpg.frontends.ini.IniFileLanguage\")" + " .defaultPasses()\n" + " .useParallelPasses(false)\n" + " .configurePass(\n" + diff --git a/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileFrontend.kt b/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileFrontend.kt similarity index 99% rename from cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileFrontend.kt rename to cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileFrontend.kt index c9b010d90b..71b17c77b3 100644 --- a/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileFrontend.kt +++ b/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileFrontend.kt @@ -23,7 +23,7 @@ * \______/ \__| \______/ * */ -package de.fraunhofer.aisec.cpg.frontend.configfiles +package de.fraunhofer.aisec.cpg.frontends.ini import de.fraunhofer.aisec.cpg.TranslationContext import de.fraunhofer.aisec.cpg.frontends.Handler diff --git a/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileLanguage.kt b/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileLanguage.kt similarity index 97% rename from cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileLanguage.kt rename to cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileLanguage.kt index 3d55cb93df..fa8388077c 100644 --- a/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileLanguage.kt +++ b/cpg-language-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileLanguage.kt @@ -23,7 +23,7 @@ * \______/ \__| \______/ * */ -package de.fraunhofer.aisec.cpg.frontend.configfiles +package de.fraunhofer.aisec.cpg.frontends.ini import de.fraunhofer.aisec.cpg.frontends.Language import de.fraunhofer.aisec.cpg.graph.types.StringType diff --git a/cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileTest.kt b/cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileTest.kt similarity index 98% rename from cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileTest.kt rename to cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileTest.kt index b0dee09da7..a314914f9c 100644 --- a/cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileTest.kt +++ b/cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/ini/IniFileTest.kt @@ -23,7 +23,7 @@ * \______/ \__| \______/ * */ -package de.fraunhofer.aisec.cpg.frontend.configfiles +package de.fraunhofer.aisec.cpg.frontends.ini import de.fraunhofer.aisec.cpg.graph.declarations.FieldDeclaration import de.fraunhofer.aisec.cpg.graph.declarations.RecordDeclaration diff --git a/cpg-neo4j/src/main/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt b/cpg-neo4j/src/main/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt index 1ae5207abd..ea2b225751 100644 --- a/cpg-neo4j/src/main/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt +++ b/cpg-neo4j/src/main/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt @@ -493,6 +493,7 @@ class Application : Callable { .optionalLanguage("de.fraunhofer.aisec.cpg.frontends.typescript.TypeScriptLanguage") .optionalLanguage("de.fraunhofer.aisec.cpg.frontends.ruby.RubyLanguage") .optionalLanguage("de.fraunhofer.aisec.cpg.frontends.jvm.JVMLanguage") + .optionalLanguage("de.fraunhofer.aisec.cpg.frontends.ini.IniFileLanguage") .loadIncludes(loadIncludes) .addIncludesToGraph(loadIncludes) .debugParser(DEBUG_PARSER)