Merge branch 'master' into clint

sireum · Jan 9, 2025 · 85abf47 · 85abf47
2 parents 7e2f8c4 + 70dccd5
commit 85abf47
Show file tree

Hide file tree

Showing 19 changed files with 346 additions and 217 deletions.
diff --git a/bin/checkVersions.sc b/bin/checkVersions.sc
@@ -136,10 +136,13 @@ compare(phantomVersionsP, phantomCurrentVers)
 
   def fcompare(name: String, expected: String): Unit = {
     val actual = ops.ISZOps(tool.opts).filter(p => p.name == name)(0).tpe.asInstanceOf[org.sireum.cli.CliOpt.Type.Str].default.get
-    if (actual != expected) {
+    val parts = ops.StringOps(expected).split(c => c == '.')
+    // NOTE: eclipse will drop the leading zero for months 01-09 so add it back if needed
+    val mdyhm: String = if (parts(2).size == 8) parts(2) else s"0${parts(2)}"
+    val _expected = s"${parts(0)}.${parts(1)}.${mdyhm}.${parts(3)}"
+    if (actual != _expected) {
       exclamations()
-      println(s"WARNING: FMIDE version for ${name} does not match: ${actual} vs ${expected}: ${fmidecli.toUri}")
-      println(s"  NOTE: eclipse will drop the leading zero for months 01-09")
+      println(s"WARNING: FMIDE version for ${name} does not match: ${actual} vs ${_expected}: ${fmidecli.toUri}")
       exclamations()
     }
   }

diff --git a/jvm/src/main/resources/codegen_versions.properties b/jvm/src/main/resources/codegen_versions.properties
@@ -1,9 +1,9 @@
 # the following should usually match the current kekinian release tag
-org.sireum.kekinian.version=1c0dea6321
+org.sireum.kekinian.version=d3c137b291
 
 
 # the following should usually be identical to kekinian's version.properties
-org.sireum.version.scalac-plugin=4.20241022.278d005
+org.sireum.version.scalac-plugin=4.20241212.72b1947
 org.sireum.version.scala=2.13.15
 org.sireum.version.scalatest=3.2.19
 

diff --git a/jvm/src/main/resources/phantom_versions.properties b/jvm/src/main/resources/phantom_versions.properties
@@ -5,8 +5,8 @@
 # segments as numbers.  So, for eg. 1.2022.08221314.qualifier will become 1.2022.8221314.qualifier.
 # Therefore an 'alt' version is also provided to make lookups simpler
 
-org.sireum.aadl.osate.plugins.version=1.2024.11051400.1c0b1259
-org.sireum.aadl.osate.plugins.version_alt=1.2024.11051400.1c0b1259
+org.sireum.aadl.osate.plugins.version=1.2025.01061040.5a6dd932
+org.sireum.aadl.osate.plugins.version_alt=1.2025.1061040.5a6dd932
 
 org.sireum.aadl.gumbo.plugins.version=1.2024.11051400.1c0b1259
 org.sireum.aadl.gumbo.plugins.version_alt=1.2024.11051400.1c0b1259

diff --git a/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/JSON.scala b/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/JSON.scala
@@ -2,7 +2,7 @@
 // @formatter:off
 
 /*
- Copyright (c) 2017-2024, Robby, Kansas State University
+ Copyright (c) 2017-2025, Robby, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/MTransformer.scala b/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/MTransformer.scala
@@ -2,7 +2,7 @@
 // @formatter:off
 
 /*
- Copyright (c) 2017-2024, Robby, Kansas State University
+ Copyright (c) 2017-2025, Robby, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/MsgPack.scala b/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/MsgPack.scala
@@ -2,7 +2,7 @@
 // @formatter:off
 
 /*
- Copyright (c) 2017-2024, Robby, Kansas State University
+ Copyright (c) 2017-2025, Robby, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/Transformer.scala b/jvm/src/main/scala/org/sireum/hamr/codegen/act/ast/Transformer.scala
@@ -2,7 +2,7 @@
 // @formatter:off
 
 /*
- Copyright (c) 2017-2024, Robby, Kansas State University
+ Copyright (c) 2017-2025, Robby, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/jvm/src/main/scala/org/sireum/hamr/codegen/arsit/nix/NixGen.scala b/jvm/src/main/scala/org/sireum/hamr/codegen/arsit/nix/NixGen.scala
@@ -100,7 +100,7 @@ object NixGen {
 
         for (p <- ports.filter(p => CommonUtil.isDataPort(p.feature))) {
           val originatingType: AadlType = p._portType match {
-            case BitType(_, _, _, _, Some(o)) => o
+            case BitType(_, _, _, Some(o)) => o
             case _ => halt(s"Unexpected: Could not find originating type for ${p._portType} used by ${p.parentName}.${p.path}")
           }
           if (!seenTypes.contains(originatingType)) {
@@ -203,7 +203,7 @@ object NixGen {
             val entry: ST = {
               if (types.rawConnections) {
                 val originatingTypeNames: TypeNameProvider = p._portType match {
-                  case BitType(_, _, _, _, Some(o)) => o.nameProvider
+                  case BitType(_, _, _, Some(o)) => o.nameProvider
                   case _ => halt(s"Unexpected: Could not find originating type for ${p._portType}")
                 }
 
@@ -662,7 +662,7 @@ object NixGen {
         val decl: ST =
           if (types.rawConnections) {
             val originatingTypeNames: TypeNameProvider = p._portType match {
-              case BitType(_, _, _, _, Some(o)) => o.nameProvider
+              case BitType(_, _, _, Some(o)) => o.nameProvider
               case _ => halt(s"Unexpected: Could not find originating type for ${p._portType}")
             }
 

diff --git a/license.md b/license.md
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2024, Kansas State University
+Copyright (c) 2017-2025, Kansas State University
 
 All rights reserved.
 

diff --git a/license.txt b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2024, Kansas State University
+Copyright (c) 2017-2025, Kansas State University
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/shared/src/main/scala/org/sireum/hamr/codegen/HamrCodegenCli.scala b/shared/src/main/scala/org/sireum/hamr/codegen/HamrCodegenCli.scala
@@ -1,6 +1,6 @@
 // #Sireum
 /*
- Copyright (c) 2017-2024, Jason Belt, Kansas State University
+ Copyright (c) 2017-2025, Jason Belt, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/shared/src/main/scala/org/sireum/hamr/codegen/common/resolvers/GclResolver.scala b/shared/src/main/scala/org/sireum/hamr/codegen/common/resolvers/GclResolver.scala
@@ -1470,7 +1470,7 @@ import org.sireum.hamr.codegen.common.resolvers.GclResolver._
 
           return ta
 
-        case TODOType(ISZ("art", "Empty"), _, _, _) =>
+        case TODOType(ISZ("art", "Empty"), _, _) =>
           val adtAst: AST.Stmt.Adt =
             AST.Stmt.Adt(
               isRoot = F,

diff --git a/shared/src/main/scala/org/sireum/hamr/codegen/common/symbols/MTransformer.scala b/shared/src/main/scala/org/sireum/hamr/codegen/common/symbols/MTransformer.scala
@@ -2,7 +2,7 @@
 // @formatter:off
 
 /*
- Copyright (c) 2017-2024, Kansas State University
+ Copyright (c) 2017-2025, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/shared/src/main/scala/org/sireum/hamr/codegen/common/symbols/Transformer.scala b/shared/src/main/scala/org/sireum/hamr/codegen/common/symbols/Transformer.scala
@@ -2,7 +2,7 @@
 // @formatter:off
 
 /*
- Copyright (c) 2017-2024, Kansas State University
+ Copyright (c) 2017-2025, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

diff --git a/shared/src/main/scala/org/sireum/hamr/codegen/common/types/AadlType.scala b/shared/src/main/scala/org/sireum/hamr/codegen/common/types/AadlType.scala
@@ -30,15 +30,15 @@ import org.sireum.hamr.ir
 @datatype class EnumType(val classifier: ISZ[String],
                          val nameProvider: TypeNameProvider,
 
-                         val container: Option[ir.Component],
+                         @hidden val container: Option[ir.Component],
                          val bitSize: Option[Z],
 
                          val values: ISZ[String]) extends AadlType
 
 @datatype class ArrayType(val classifier: ISZ[String],
                           val nameProvider: TypeNameProvider,
 
-                          val container: Option[ir.Component],
+                          @hidden val container: Option[ir.Component],
                           val bitSize: Option[Z],
 
                           val dimensions: ISZ[Z],
@@ -47,7 +47,7 @@ import org.sireum.hamr.ir
 @datatype class RecordType(val classifier: ISZ[String],
                            val nameProvider: TypeNameProvider,
 
-                           val container: Option[ir.Component],
+                           @hidden val container: Option[ir.Component],
                            val bitSize: Option[Z],
 
                            val fields: Map[String, AadlType]
@@ -56,7 +56,7 @@ import org.sireum.hamr.ir
 @datatype class BaseType(val classifier: ISZ[String],
                          val nameProvider: TypeNameProvider,
 
-                         val container: Option[ir.Component],
+                         @hidden val container: Option[ir.Component],
                          val bitSize: Option[Z],
 
                          val slangType: SlangType.Type
@@ -65,15 +65,15 @@ import org.sireum.hamr.ir
 @datatype class TODOType(val classifier: ISZ[String],
                          val nameProvider: TypeNameProvider,
 
-                         val container: Option[ir.Component],
+                         @hidden val container: Option[ir.Component],
                          val bitSize: Option[Z]
 
                         ) extends AadlType
 
 @datatype class BitType(val classifier: ISZ[String],
                         val nameProvider: TypeNameProvider,
 
-                        val container: Option[ir.Component],
+                        @hidden val container: Option[ir.Component],
                         val bitSize: Option[Z],
 
                         val originatingType: Option[AadlType]) extends AadlType

diff --git a/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CommonCli.scala b/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CommonCli.scala
@@ -1,6 +1,6 @@
 // #Sireum
 /*
- Copyright (c) 2017-2024, Jason Belt, Kansas State University
+ Copyright (c) 2017-2025, Jason Belt, Kansas State University
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without