Merge pull request #1 from bastie/swift6

Swift6

Author: bastie

.gitignore

@@ -7,3 +7,6 @@ DerivedData/
 .swiftpm/configuration/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
+
+Package.resolved
+

Package.resolved

@@ -1,11 +1,11 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "LStXML2Code",
-    platforms: [.macOS(.v13)],
+    platforms: [.macOS(.v15)],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
@@ -16,7 +16,7 @@ let package = Package(
     dependencies: [
       .package(
         url: "https://github.com/bastie/JavApi4Swift.git",
-        from: "0.7.5"
+        from: "0.25.0"
       )
     ],
     targets: [

Package.swift

@@ -9,7 +9,7 @@ import LStXML2Code
 /// Quelletxtgenerator zur Nutzung des durch das BMF bereitgestellten Pseudo-Quelltext zur Berechnung der Lohnsteuerabzüge bei der Einkommensteuer.
 public struct BMF2Code {
   /// Interne Version
-  public static let VERSION = "1.0.3"
+  public static let VERSION = "1.1.0"
 
 
   // MARK: main entry point

Sources/BMF2Code/BMF2Code.swift

@@ -13,7 +13,7 @@ public class CharNode : Node , CustomDebugStringConvertible {
 
   let char : Character
 
-  static var initiated : [Character:CharNode] = [:]
+  nonisolated(unsafe) static var initiated : [Character:CharNode] = [:]
   public static func value (of newChar : Character) -> CharNode {
     if let result = initiated[newChar] {
       return result

Sources/LStXML2Code/Nodes/CharNode.swift

@@ -25,7 +25,7 @@ public class FloatNumberNode : Node, CustomDebugStringConvertible {
 
   /// Set the new Value and return the oldValue. On error return nil
   public func setValue (stringRepresentation : String) -> Double?{
-    if let newValue = Double(stringRepresentation) {
+    if let _ = Double(stringRepresentation) {
       let oldValue = self.asString
       self.asString = stringRepresentation
       return Double(oldValue)

Sources/LStXML2Code/Nodes/FloatNumberNode.swift

@@ -24,7 +24,7 @@ class PAPTreeEncodingImpl : PAPTreeEncoding {
     for (name,value) in oldAttributes {
       newNode.addAttribute(name, value)
       if name == "exec" {
-        exec(stmt: value)
+        _ = exec(stmt: value)
       }
     }
     for child in oldNode.getChilds() {
@@ -168,7 +168,7 @@ class PAPTreeEncodingImpl : PAPTreeEncoding {
           }
           position.count += 1
         }
-        else if let nextNode = node as? DotNode { // maybe it is a float value
+        else if let _ = node as? DotNode { // maybe it is a float value
           if let _ = number {
             number!.append(".") // better generator error than runtime error, so ! instead of ? is using
             position.count += 1
@@ -230,21 +230,21 @@ class PAPTreeEncodingImpl : PAPTreeEncoding {
     // MARK: DotNodes in Statement to Tree
 
     for i in 0..<asNodes.count {
-      if let dot = asNodes[i] as? DotNode {
-        if let receiver = asNodes[i-1] as? ValueNode,
-           let message = asNodes[i+1] as? ValueNode {
+      if let _ = asNodes[i] as? DotNode {
+        if let _ = asNodes[i-1] as? ValueNode,
+           let _ = asNodes[i+1] as? ValueNode {
           //print ("call \(message.getValue()) on type \(receiver.getValue())")
         }
-        else if let receiver = asNodes[i-1] as? IdentiferNode,
-                let message = asNodes[i+1] as? ValueNode {
+        else if let _ = asNodes[i-1] as? IdentiferNode,
+                let _ = asNodes[i+1] as? ValueNode {
           //print ("call \(message.getValue()) on instance \(receiver.getName())")
         }
-        else if let receiver = asNodes[i-1] as? ClosedRoundBracketNode,
-                let message = asNodes[i+1] as? ValueNode {
+        else if let _ = asNodes[i-1] as? ClosedRoundBracketNode,
+                let _ = asNodes[i+1] as? ValueNode {
           //print ("call \(message.getValue()) on result of before")
         }
-        else if let receiver = asNodes[i-1] as? ClosedSquareBracketNode,
-                let message = asNodes[i+1] as? ValueNode {
+        else if let _ = asNodes[i-1] as? ClosedSquareBracketNode,
+                let _ = asNodes[i+1] as? ValueNode {
           //print ("call \(message.getValue()) on array element before")
         }
         else {
@@ -256,19 +256,19 @@ class PAPTreeEncodingImpl : PAPTreeEncoding {
         // Note: a subclass or subtype is handled as CONSTANT
         do {
           var messageType : String?
-          let message = asNodes[i+1]
+          let _ = asNodes[i+1]
           for var j in (i+2)..<asNodes.count {
             if let _ = asNodes[j] as? SpaceNode {
               // skip
             }
             else if let _ = asNodes[j] as? OpenRoundBracketNode {
               messageType = "METHOD"
             }
-            if let messageType {
+            if let _ = messageType {
               j = asNodes.count
             }
           }
-          if let messageType {} else {
+          if let _ = messageType {} else {
             messageType = "CONSTANT"
           }
 
@@ -694,7 +694,7 @@ class PAPTreeEncodingImpl : PAPTreeEncoding {
           }
           break
         case ".":
-          if let numeric = Int (next) // Ziffer / Nummer?
+          if let _ = Int (next) // Ziffer / Nummer?
                                       //&& !numericDetected // aber nicht schon ein Dezimal erkannt => Fehler
           {
             print ("number detected: \(next) - waiting for end")
@@ -761,7 +761,7 @@ class PAPTreeEncodingImpl : PAPTreeEncoding {
         content = next.trimmingCharacters(in: .whitespaces)
       } // END-FOR
       // last part of statement
-      var detected =  next.trimmingCharacters(in: .whitespaces)
+      let detected =  next.trimmingCharacters(in: .whitespaces)
       if detected.count > 0 {
         if callDetected {
           print ("call detected with target: \(next)")