interface generator: allow comments inside classes

although the Pascal generator merging field type declarations, messes the comments up by putting them all at the beginning

android/android/src/de/benibela/videlibri/jni/CommonInterface.kt

@@ -118,12 +118,10 @@ object ImportExportFlag {
 }
 
 
-
-//nativePtr is a very large object which must be destroyed with a call to VLImportAccounts
-
   open class ImportExportData( 
     @JvmField var accountsToImport: Array<String> = emptyArray(),
     @JvmField var flags: Int = 0,
+    //nativePtr is a very large object which must be destroyed with a call to VLImportAccounts,
     @JvmField var nativePtr: Long = 0
   )   {
     override fun equals(other: Any?): Boolean =

commoninterface.pas

@@ -201,6 +201,7 @@ TOptionsShared = class
 type 
 
 TImportExportData = record
+  //nativePtr is a very large object which must be destroyed with a call to VLImportAccounts
   flags: int32;
   nativePtr: int64;
   accountsToImport: array of string;

interface-generator-pretty-to-xml.xqm

@@ -53,14 +53,15 @@ declare function igp:make-class($annotations, $nameAndParent, $children){
       case "@KotlinDataClass" return attribute kotlin-class {"data"} 
       case "@PascalClass" return attribute pascal-type {"class"} 
       default return igp:annotation-to-attribute($a),
-  for $x in $children!translate(., " ", "") 
+  for $w in $children
+  let $x := $w!translate(., " ", "") 
   let $split := extract($x, "([^:]+):([^=]+)(=\s*(.*))?", (1,2,4) )
   let $name := $split[1]!normalize-space()
   let $type := $split[2]!normalize-space()
   let $default := $split[3]
   let $default := $default!(if ($type = "String") then replace(., '^"|"$', '') else .) 
-  return 
-    igp:make-type($type, (attribute name { $name }, $default[.] ! attribute default { . } ) )
+  return if (starts-with($x, "//")) then <comment>{$w!replace(., "^//", "")}</comment>
+  else igp:make-type($type, (attribute name { $name }, $default[.] ! attribute default { . } ) )
 }
   </class>
 };

interface-generator.xqm

@@ -9,7 +9,7 @@ declare function ig:error($e, $at){
 };
 
 declare function ig:properties($e){
-  $e/*
+  $e/*[not(self::comment)]
 };
 
 declare function ig:parent($e){
@@ -79,6 +79,7 @@ declare function ig:pascal-make-fields-of-type($s, $type){
 };
 
 declare function ig:pascal-make-fields($s, $prefix){
+  $s/comment/x"//{.}", 
   ig:pascal-make-fields-of-type($s/string, $prefix || "string"),
   ig:pascal-make-fields-of-type($s/int, $prefix || "int32"),
   ig:pascal-make-fields-of-type($s/long, $prefix || "int64"),
@@ -430,7 +431,8 @@ begin
      case element(array)   return x"   temp[{$i}].l := arrayToJArrayCI(self.{$p/@name});
"
      case element(classref)   return x"   temp[{$i}].l := self.{$p/@name}.toJava;
"
      case element(intenumref) return x"   temp[{$i}].i := ord(self.{$p/@name});
"
-     default return ig:error("unknown property type")
+     case element(comment) return ()
+     default return ig:error("unknown property type (toJava)")
    }
     result := newObject({@id}Class, {@id}ClassInit, @temp[0]); 
  {for $p at $i in $allprops where $p[self::array or self::string or self::classref] return x"   deleteLocalRef(temp[{$i - 1}].l);
"}
@@ -449,7 +451,8 @@ begin
      case element(array)   return x"   fromJavaArrayAndDelete({@name}, getObjectField( jvm, {@name}{ig:jni-pascal-suffix(.)} ));
"
      case element(classref)   return x"   {@name} := T{@ref}.fromJavaAndDelete(getObjectField( jvm, {@name}{ig:jni-pascal-suffix(.)} ));
"
      case element(intenumref)   return x"   {@name} := T{@ref}(getIntField( jvm, {@name}I ));
"
-     default return ig:error("unknown property type.")
+     case element(comment) return ()
+     default return ig:error("unknown property type. (fromJava)")
    )}
  end;
 end;
@@ -542,7 +545,10 @@ declare function ig:kotlin-make-class($s){
   {(@kotlin-class, "open")[1]} class {@id}( 
     { join ((
     $aprops!ig:kotlin-make-prop(., $addDefault),
-    */ig:kotlin-make-prop(., $addDefault)!concat($fieldtype,.)
+    */(
+      if (self::comment) then x"//{.}"
+      else ig:kotlin-make-prop(., $addDefault)!concat($fieldtype,.)
+    )
   ), ",
    ") 
   }
   ) {ig:parent(.)!x": {.}({join($aprops!@name, ", ")})"}  {{
@@ -551,13 +557,15 @@ declare function ig:kotlin-make-class($s){
          typeswitch (.)
            case element(string)|element(int)|element(long)|element(double)|element(boolean)|element(classref)|element(intenumref) return concat(@name, " == other.", @name)
            case element(array) return concat(@name, ".contentEquals(other.", @name,")")
+           case element(comment) return ()
            default return ig:error("Unknown field type", .)
        )), " && ")}
     override fun hashCode(): Int =
-      super.hashCode() { */concat("xor ",
+      super.hashCode() { ig:properties(.)/concat("xor ",
         typeswitch (.)
           case element(string)|element(int)|element(long)|element(double)|element(boolean)|element(classref)|element(intenumref) return @name || ".hashCode()"
           case element(array) return concat(@name, ".contentHashCode()")
+          case element(comment) return ()
           default return ig:error("Unknown field type", .)
       , ".rotateLeft(",position(),")" ) }
   }}")

interface.pretty

@@ -108,12 +108,12 @@ enum ImportExportFlag {
 }
 
 
-//nativePtr is a very large object which must be destroyed with a call to  VLImportAccounts  
 @Pascal<->Kotlin
 @KotlinVar
 class ImportExportData {
   accountsToImport: String[]
   flags: Int  
+  //nativePtr is a very large object which must be destroyed with a call to  VLImportAccounts  
   nativePtr: Long
 }
 

interface.xml

@@ -71,12 +71,12 @@
     <value name="Config" value="4"/>
     <value name="Password" value="8"/>
   </intenum>
-  <comment>nativePtr is a very large object which must be destroyed with a call to VLImportAccounts</comment>
   <class id="ImportExportData" jvm-pascal="" pascal-jvm="" kotlin-var="var">
     <array name="accountsToImport">
       <string/>
     </array>
     <int name="flags"/>
+    <comment>nativePtr is a very large object which must be destroyed with a call to VLImportAccounts</comment>
     <long name="nativePtr"/>
   </class>
   <comment>Classes to represent metadata of a library</comment>