[2.0] Updates (#574)

* [PSym] Update importing foreign functions

Updates how files containing foreign functions are imported with the new P 2.0 paths

* [PSym] Update examples with foreign functions

* [PCompiler] Completely eliminate nuget dependency on PCSharpRuntime/PCheckerCore for p check command

Remove all runtime dependencies on PCSharpRuntime or PCheckerCore nuget packages. Instead, import from local .dll files already installed when installing P

.github/workflows/release.yml

@@ -45,5 +45,3 @@ jobs:
       - name: Push generated package to Nuget
         run: |
           dotnet nuget push ./Bld/Drops/Release/Binaries/P.${VERSION}.nupkg -k ${{ secrets.NUGET_SECRET }} -s https://api.nuget.org/v3/index.json --no-symbols --skip-duplicate
-          dotnet nuget push ./Bld/Drops/Release/Binaries/PCSharpRuntime.${VERSION}.nupkg -k ${{ secrets.NUGET_SECRET }} -s https://api.nuget.org/v3/index.json --no-symbols --skip-duplicate
-          dotnet nuget push ./Bld/Drops/Release/Binaries/PCheckerCore.${VERSION}.nupkg -k ${{ secrets.NUGET_SECRET }} -s https://api.nuget.org/v3/index.json --no-symbols --skip-duplicate

Src/PCompiler/CompilerCore/Backend/CSharp/CSharpCodeGenerator.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using Plang.Compiler.Backend.ASTExt;
 using Plang.Compiler.TypeChecker;
 using Plang.Compiler.TypeChecker.AST;
@@ -48,13 +49,8 @@ public void Compile(ICompilerConfiguration job)
                 }
                 csprojTemplate = csprojTemplate.Replace("-foreign-include-", foreignInclude);
 
-                string versionString = "2.*";                
-                var version = typeof(CSharpCodeGenerator).Assembly.GetName().Version;
-                if (version is not null && version.Major > 1)
-                {
-                    versionString = version.ToString();
-                }
-                csprojTemplate = csprojTemplate.Replace("-version-", versionString);
+                string assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                csprojTemplate = csprojTemplate.Replace("-assembly-path-", assemblyPath);
 
                 File.WriteAllText(csprojPath, csprojTemplate);
             }

Src/PCompiler/CompilerCore/Backend/CSharp/Constants.cs

@@ -14,7 +14,12 @@ internal class Constants
   </PropertyGroup>
 -foreign-include-
   <ItemGroup>
-    <PackageReference Include=""PCSharpRuntime"" Version=""-version-""/>
+    <Reference Include=""PCSharpRuntime"">
+        <HintPath>-assembly-path-/PCSharpRuntime.dll</HintPath>
+    </Reference>
+    <Reference Include=""PCheckerCore"">
+        <HintPath>-assembly-path-/PCheckerCore.dll</HintPath>
+    </Reference>
   </ItemGroup>
 </Project>";
 

Src/PCompiler/CompilerCore/Backend/Symbolic/Constants.cs

@@ -11,12 +11,13 @@ internal class Constants
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>psym.model</groupId>
-    <artifactId>projectName</artifactId>
+    <artifactId>-project-name-</artifactId>
     <version>1.0</version>
 
     <build>
         <sourceDirectory>.</sourceDirectory>
         <plugins>
+            -foreign-include-
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>2.22.2</version>
@@ -42,7 +43,7 @@ internal class Constants
                     </execution>
                 </executions>
                 <configuration>
-                    <finalName>projectName</finalName>
+                    <finalName>-project-name-</finalName>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
@@ -61,7 +62,7 @@ internal class Constants
         <dependency>
             <groupId>io.github.p-org</groupId>
             <artifactId>psym</artifactId>
-            <version>[0.5.6,)</version>
+            <version>[1.0.0,)</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
@@ -80,6 +81,28 @@ internal class Constants
         <java.version>16</java.version>
     </properties>
 </project>
+";
+
+        internal static readonly string pomForeignTemplate =
+            @"
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+-foreign-source-include-                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 ";
     }
 }

Src/PCompiler/CompilerCore/Backend/Symbolic/SymbolicCodeGenerator.cs

@@ -37,7 +37,33 @@ public void Compile(ICompilerConfiguration job)
             // if the file does not exist then create the file
             if (!File.Exists(pomPath))
             {
-                var pomTemplate = Constants.pomTemplate.Replace("projectName",job.ProjectName);
+                var pomTemplate = Constants.pomTemplate;
+                pomTemplate = pomTemplate.Replace("-project-name-",job.ProjectName);
+
+                string foreignInclude = "";
+                var foreignFiles = job.InputForeignFiles.Where(x => x.EndsWith(".java"));
+                if (foreignFiles.Any())
+                {
+                    foreignInclude = Constants.pomForeignTemplate;
+                    string foreignSourceInclude = "";
+                    SortedSet<string> foreignFolders = new SortedSet<string>();
+
+                    foreach (var fileName in foreignFiles)
+                    {
+                        var folderName = Path.GetDirectoryName(fileName);
+                        if (folderName is not null)
+                        {
+                            foreignFolders.Add(folderName);
+                        }
+                    }
+                    foreach (var folderName in foreignFolders)
+                    {
+                        foreignSourceInclude += $"                                <source>{folderName}</source>\n";
+                    }
+                    foreignInclude = foreignInclude.Replace("-foreign-source-include-", foreignSourceInclude);
+                }
+                pomTemplate = pomTemplate.Replace("-foreign-include-", foreignInclude);
+
                 File.WriteAllText(pomPath, pomTemplate);
             }
 

Src/PCompiler/PCommandLine/PCommandLine.csproj

@@ -23,6 +23,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\PChecker\CheckerCore\CheckerCore.csproj" />
+    <ProjectReference Include="..\..\PRuntimes\PCSharpRuntime\CSharpRuntime.csproj" />
     <ProjectReference Include="..\CompilerCore\CompilerCore.csproj" />
     <None Include="../../../Icon/icon.png" Pack="true" PackagePath="" />
     <None Include="../../../README.md" Pack="true" PackagePath="" />

Src/PRuntimes/PSymRuntime/Examples/tests/PingPongForeign/pingPongForeign1/pingPongForeign1.pproj

@@ -1,7 +1,8 @@
 <Project>
 <ProjectName>pingPongForeign1</ProjectName>
 <InputFiles>
-	<PFile>./</PFile>
+	<PFile>./PSrc/</PFile>
+        <PFile>./PForeign/</PFile>
 </InputFiles>
-<Target>Symbolic</Target>
-</Project>
+<OutputDir>./PGenerated/</OutputDir>
+</Project>

Src/PRuntimes/PSymRuntime/Examples/tests/PingPongForeign/pingPongForeign2/PForeign/CustomInt.java

@@ -0,0 +1,20 @@
+package psym.model;
+
+import lombok.Getter;
+import psym.runtime.values.*;
+
+public class CustomInt {
+    @Getter
+    private int value;
+
+    CustomInt(int val) {
+        this.value = (int) val;
+    }
+
+    CustomInt(Object val) {
+        if (val instanceof CustomInt)
+            this.value = ((CustomInt) val).getValue();
+        else
+            this.value = (int) val;
+    }
+}

Src/PRuntimes/PSymRuntime/Examples/tests/PingPongForeign/pingPongForeign2/pingPongForeign2.pproj

@@ -1,7 +1,8 @@
 <Project>
 <ProjectName>pingPongForeign2</ProjectName>
 <InputFiles>
-	<PFile>./</PFile>
+	<PFile>./PSrc/</PFile>
+        <PFile>./PForeign/</PFile>
 </InputFiles>
-<Target>Symbolic</Target>
-</Project>
+<OutputDir>./PGenerated/</OutputDir>
+</Project>

Src/PRuntimes/PSymRuntime/Examples/tests/PingPongForeign/pingPongForeign3/PForeign/CustomInt.java

@@ -0,0 +1,20 @@
+package psym.model;
+
+import lombok.Getter;
+import psym.runtime.values.*;
+
+public class CustomInt {
+    @Getter
+    private int value;
+
+    CustomInt(int val) {
+        this.value = (int) val;
+    }
+
+    CustomInt(Object val) {
+        if (val instanceof CustomInt)
+            this.value = ((CustomInt) val).getValue();
+        else
+            this.value = (int) val;
+    }
+}

Src/PRuntimes/PSymRuntime/Examples/tests/PingPongForeign/pingPongForeign3/pingPongForeign3.pproj

@@ -1,7 +1,9 @@
 <Project>
 <ProjectName>pingPongForeign3</ProjectName>
 <InputFiles>
-	<PFile>./</PFile>
+	<PFile>./PSrc/</PFile>
+	<PFile>./PTst/</PFile>
+	<PFile>./PForeign/</PFile>
 </InputFiles>
-<Target>Symbolic</Target>
+<OutputDir>./PGenerated/</OutputDir>
 </Project>

Src/PRuntimes/PSymRuntime/Examples/tests/PingPongForeign/pingPongForeign4/pingPongForeign4.pproj

@@ -1,7 +1,8 @@
 <Project>
 <ProjectName>pingPongForeign1</ProjectName>
 <InputFiles>
-	<PFile>./</PFile>
+	<PFile>./PSrc/</PFile>
+	<PFile>./PForeign/</PFile>
 </InputFiles>
-<Target>Symbolic</Target>
+<OutputDir>./PGenerated/</OutputDir>
 </Project>

Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/values/PBool.java

@@ -15,7 +15,10 @@ public PBool(boolean val)
 
     public PBool(Object val)
     {
-        value = (boolean) val;
+        if (val instanceof PBool)
+            value = ((PBool) val).value;
+        else
+            value = (boolean) val;
     }
 
     public PBool(PBool val)

Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/values/PFloat.java

@@ -15,7 +15,10 @@ public PFloat(double val)
 
     public PFloat(Object val)
     {
-        value = (double) val;
+        if (val instanceof PFloat)
+            value = ((PFloat) val).value;
+        else
+            value = (double) val;
     }
 
     public PFloat(PFloat val)

Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/values/PInt.java

@@ -13,7 +13,10 @@ public PInt(int val)
 
     public PInt(Object val)
     {
-        value = (int) val;
+        if (val instanceof PInt)
+            value = ((PInt) val).value;
+        else
+            value = (int) val;
     }
 
     public PInt(PInt val)

Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/values/PMachineValue.java

@@ -15,7 +15,10 @@ public PMachineValue(Machine val)
 
     public PMachineValue(Object val)
     {
-        value = (Machine) val;
+        if (val instanceof PMachineValue)
+            value = ((PMachineValue) val).value;
+        else
+            value = (Machine) val;
     }
 
     public PMachineValue(PMachineValue val)

Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/values/PString.java

@@ -13,7 +13,10 @@ public PString(String val)
 
     public PString(Object val)
     {
-        value = (String) val;
+        if (val instanceof PString)
+            value = ((PString) val).value;
+        else
+            value = (String) val;
     }
 
     public PString(PString val)