Enum値の出力

refs #19
love2hina-net · Feb 20, 2022 · d07ce7c · d07ce7c
1 parent 2706b10
commit d07ce7c
Show file tree

Hide file tree

Showing 18 changed files with 482 additions and 226 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,7 +35,7 @@ plugins {
 }
 
 group = "net.love2hina"
-version = "0.2.0-alpha1"
+version = "0.3.0-SNAPSHOT"
 
 val versions: Map<String, Any> by extra
 

diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/SmartXMLStreamWriter.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/SmartXMLStreamWriter.kt
@@ -34,8 +34,7 @@ internal class SmartXMLStreamWriter(file: File): XMLStreamWriter, Closeable {
 
     private fun outputIndent() {
         xmlWriter.writeCharacters(lineSeparator)
-        if (level > 0)
-            xmlWriter.writeCharacters(" ".repeat(indentSize * level))
+        if (level > 0) { xmlWriter.writeCharacters(" ".repeat(indentSize * level)) }
     }
 
     private fun outputElementBody() {
@@ -139,15 +138,15 @@ internal class SmartXMLStreamWriter(file: File): XMLStreamWriter, Closeable {
     }
 
     override fun writeAttribute(localName: String, value: String?) {
-        if (value != null) xmlWriter.writeAttribute(localName, value)
+        if (value != null) { xmlWriter.writeAttribute(localName, value) }
     }
 
     override fun writeAttribute(namespaceURI: String?, localName: String, value: String?) {
-        if (value != null) xmlWriter.writeAttribute(namespaceURI, localName, value)
+        if (value != null) { xmlWriter.writeAttribute(namespaceURI, localName, value) }
     }
 
     override fun writeAttribute(prefix: String?, namespaceURI: String?, localName: String, value: String?) {
-        if (value != null) xmlWriter.writeAttribute(prefix, namespaceURI, localName, value)
+        if (value != null) { xmlWriter.writeAttribute(prefix, namespaceURI, localName, value) }
     }
 
     override fun writeComment(data: String?) {
@@ -179,7 +178,7 @@ internal class SmartXMLStreamWriter(file: File): XMLStreamWriter, Closeable {
             else -> {
                 // 複数行出力
                 lines.stream()
-                    .forEach{
+                    .forEach {
                         outputElementBody()
                         xmlWriter.writeCharacters(it.trim())
                     }

diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/Utility.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/Utility.kt
@@ -2,8 +2,6 @@ package net.love2hina.kotlin.sharon
 
 import com.github.javaparser.ast.Modifier
 import com.github.javaparser.ast.NodeList
-import com.github.javaparser.ast.comments.Comment
-import net.love2hina.kotlin.sharon.data.*
 
 import kotlin.reflect.KClass
 import kotlin.reflect.KMutableProperty
@@ -51,35 +49,3 @@ internal fun getModifier(modifiers: NodeList<Modifier>): String =
         .reduce(StringBuilder(),
             { a: StringBuilder, i: String -> a.appendSeparator(COMMA, i) },
             { a: StringBuilder, b: StringBuilder -> a.appendSeparator(COMMA, b) }).toString()
-
-internal fun getCommentContents(comment: Comment): String =
-    comment.content.split(REGEXP_NEWLINE)
-        .stream().map { l ->
-            val m = REGEXP_BLOCK_COMMENT.find(l)
-            if (m != null)
-                (m.groups as MatchNamedGroupCollection)["content"]?.value ?: ""
-            else l
-        }
-        .reduce(StringBuilder(),
-            { b, l -> b.appendNewLine(l) },
-            { b1, b2 -> b1.appendNewLine(b2) })
-        .toString()
-
-internal fun pushJavadocComment(content: String, name: String?, start: Int, range: IntRange, info: JavadocInfo ): Int {
-
-    if (start < range.start) {
-        val value = content.substring(start, range.start).trim()
-
-        when {
-            info.parseTag(name, value) -> {}
-            name == null -> {
-                info.description.appendNewLine(value)
-            }
-            else -> {
-                info.description.appendNewLine("@$name $value")
-            }
-        }
-    }
-
-    return range.endInclusive + 1
-}
diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/data/ClassInfo.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/data/ClassInfo.kt
@@ -27,15 +27,12 @@ internal data class ClassInfo(
 
     /*
      * @see
-     * {@link}
-     * {@linkplain}
-     * {@docRoot}
      */
 
 ): JavadocInfo {
 
-    override fun parseTag(name: String?, value: String): Boolean {
-        return when (name) {
+    override fun parseTag(name: String?, value: String): Boolean
+        = when (name) {
             "param" -> {
                 val r = Regex("^<(?<type>\\w+)>(?:\\s+(?<desc>.*))?$")
                 val m = r.find(value)
@@ -65,6 +62,5 @@ internal data class ClassInfo(
             }
             else -> false
         }
-    }
 
 }
diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/data/EnumEntryInfo.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/data/EnumEntryInfo.kt
@@ -0,0 +1,35 @@
+package net.love2hina.kotlin.sharon.data
+
+import net.love2hina.kotlin.sharon.setProperty
+
+internal data class EnumEntryInfo(
+
+    /** 説明 */
+    override val description: StringBuilder = StringBuilder(),
+
+    /** since */
+    var since: String? = null,
+
+    /** deprecated */
+    var deprecated: String? = null,
+
+    /** serial */
+    var serial: String? = null,
+
+    /*
+     * @see
+     * @serialField
+     */
+
+): JavadocInfo {
+
+    override fun parseTag(name: String?, value: String): Boolean
+        = when (name) {
+            "since", "deprecated", "serial" -> {
+                this.setProperty(name, value)
+                true
+            }
+            else -> false
+        }
+
+}
diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/data/EnumInfo.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/data/EnumInfo.kt
@@ -0,0 +1,44 @@
+package net.love2hina.kotlin.sharon.data
+
+import net.love2hina.kotlin.sharon.setProperty
+
+internal data class EnumInfo(
+
+    /** 説明 */
+    override val description: StringBuilder = StringBuilder(),
+
+    /** since */
+    var since: String? = null,
+
+    /** deprecated */
+    var deprecated: String? = null,
+
+    /** serial */
+    var serial: String? = null,
+
+    /** author */
+    val author: MutableList<String> = mutableListOf(),
+
+    /** version */
+    var version: String? = null,
+
+    /*
+     * @see
+     */
+
+): JavadocInfo {
+
+    override fun parseTag(name: String?, value: String): Boolean
+        = when (name) {
+            "author" -> {
+                author.addAll(value.split(", "))
+                true
+            }
+            "since", "deprecated", "serial", "version" -> {
+                this.setProperty(name, value)
+                true
+            }
+            else -> false
+        }
+
+}
diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/data/JavadocInfo.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/data/JavadocInfo.kt
@@ -1,9 +1,69 @@
 package net.love2hina.kotlin.sharon.data
 
+import com.github.javaparser.ast.comments.Comment
+import net.love2hina.kotlin.sharon.appendNewLine
+import java.util.Optional
+
 internal interface JavadocInfo {
 
     val description: StringBuilder
 
     fun parseTag(name: String?, value: String): Boolean
 
 }
+
+internal fun Optional<Comment>.parseJavadoc(info: JavadocInfo) {
+    this.ifPresent {
+        if (it.isJavadocComment) {
+            val content = getCommentContents(it)
+            var index = 0
+            var name: String? = null
+
+            // Javadocをパースする
+            for (match in REGEXP_ANNOTATION.findAll(content)) {
+                index = pushJavadocComment(content, name, index, match.range, info)
+                name = (match.groups as MatchNamedGroupCollection)["name"]!!.value
+            }
+            pushJavadocComment(content, name, index, IntRange(content.length, content.length), info)
+        }
+        else if (it.isBlockComment) {
+            val content = getCommentContents(it)
+            info.description.appendNewLine(content)
+        }
+        else {
+            info.description.appendNewLine(it.content)
+        }
+    }
+}
+
+private fun getCommentContents(comment: Comment): String =
+    comment.content.split(REGEXP_NEWLINE)
+        .stream().map { l ->
+            val m = REGEXP_BLOCK_COMMENT.find(l)
+            if (m != null)
+                (m.groups as MatchNamedGroupCollection)["content"]?.value ?: ""
+            else l
+        }
+        .reduce(StringBuilder(),
+            { b, l -> b.appendNewLine(l) },
+            { b1, b2 -> b1.appendNewLine(b2) })
+        .toString()
+
+private fun pushJavadocComment(content: String, name: String?, start: Int, range: IntRange, info: JavadocInfo ): Int {
+
+    if (start < range.start) {
+        val value = content.substring(start, range.start).trim()
+
+        when {
+            info.parseTag(name, value) -> {}
+            name == null -> {
+                info.description.appendNewLine(value)
+            }
+            else -> {
+                info.description.appendNewLine("@$name $value")
+            }
+        }
+    }
+
+    return range.endInclusive + 1
+}
diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/data/MethodInfo.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/data/MethodInfo.kt
@@ -20,20 +20,16 @@ internal data class MethodInfo(
     val throws: HashMap<String, ThrowsInfo> = LinkedHashMap(),
 
     /*
-    * see
-@since
-@deprecated
-@serialData
-{@link}
-{@linkplain}
-{@inheritDoc}
-{@docRoot}
-    * */
+     * see
+     * @since
+     * @deprecated
+     * @serialData
+     */
 
 ): JavadocInfo {
 
-    override fun parseTag(name: String?, value: String): Boolean {
-        return when (name) {
+    override fun parseTag(name: String?, value: String): Boolean
+        = when (name) {
             "param" -> {
                 val r = Regex("^(?:(?<name>\\w+)|<(?<type>\\w+)>)(?:\\s+(?<desc>.*))?$")
                 val m = r.find(value)
@@ -86,6 +82,5 @@ internal data class MethodInfo(
             }
             else -> false
         }
-    }
 
 }
diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/parser/ClassVisitor.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/parser/ClassVisitor.kt
@@ -23,27 +23,7 @@ internal fun Parser.Visitor.visitInClass(n: ClassOrInterfaceDeclaration, arg: Vo
     }
 
     // コメントの解析
-    n.comment.ifPresent {
-        if (it.isJavadocComment) {
-            val content = getCommentContents(it)
-            var index = 0
-            var name: String? = null
-
-            // Javadocをパースする
-            for (match in REGEXP_ANNOTATION.findAll(content)) {
-                index = pushJavadocComment(content, name, index, match.range, classInfo)
-                name = (match.groups as MatchNamedGroupCollection)["name"]!!.value
-            }
-            pushJavadocComment(content, name, index, IntRange(content.length, content.length), classInfo)
-        }
-        else if (it.isBlockComment) {
-            val content = getCommentContents(it)
-            classInfo.description.appendNewLine(content)
-        }
-        else {
-            classInfo.description.appendNewLine(it.content)
-        }
-    }
+    n.comment.parseJavadoc(classInfo)
 
     // 出力開始
     writer.writeStartElement("class")
@@ -90,7 +70,6 @@ internal fun Parser.Visitor.visitInClass(n: ClassOrInterfaceDeclaration, arg: Vo
 
     // アノテーション
     n.annotations.forEach { it.accept(this, arg) }
-
     // メンバー
     n.members.forEach { it.accept(this, arg) }
 

diff --git a/src/main/kotlin/net/love2hina/kotlin/sharon/parser/ConditionVisitor.kt b/src/main/kotlin/net/love2hina/kotlin/sharon/parser/ConditionVisitor.kt
@@ -93,8 +93,7 @@ internal fun Parser.Visitor.visitInSwitch(n: SwitchStmt, arg: Void?) {
 
     // 条件エントリ
     for (i in n.entries) {
-        if (!caseContinue)
-            writer.writeStartElement("case")
+        if (!caseContinue) { writer.writeStartElement("case") }
 
         // コメント
         i.comment.ifPresent { it.accept(this, arg) }
@@ -110,8 +109,7 @@ internal fun Parser.Visitor.visitInSwitch(n: SwitchStmt, arg: Void?) {
         writer.writeEndElement()
 
         caseContinue = i.statements.isEmpty()
-        if (!caseContinue)
-            writer.writeEndElement()
+        if (!caseContinue) { writer.writeEndElement() }
     }
 
     writer.writeEndElement()