package name を github のルールにあわせた

okomeki · Nov 5, 2021 · 3ebf0c1 · 3ebf0c1
1 parent e9a6d90
commit 3ebf0c1
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 61 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.siisise</groupId>
-    <artifactId>SoftLibABNF</artifactId>
-    <version>1.1.0</version>
+    <artifactId>softlib-abnf</artifactId>
+    <version>1.1.1</version>
     <packaging>jar</packaging>
     <build>
         <plugins>
@@ -25,8 +25,8 @@
     <dependencies>
         <dependency>
             <groupId>net.siisise</groupId>
-            <artifactId>SoftLib</artifactId>
-            <version>1.1.0</version>
+            <artifactId>softlib</artifactId>
+            <version>1.1.1</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -48,6 +48,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>github</id>
+            <name>GitHub okomeki Apache Maven SoftLib Packages</name>
+            <layout>default</layout>
+            <url>https://maven.pkg.github.com/okomeki/softlibabnf</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/src/main/java/net/siisise/abnf/ABNFmap.java b/src/main/java/net/siisise/abnf/ABNFmap.java
@@ -14,24 +14,24 @@
 public class ABNFmap extends IsABNF {
 
     private final List<Integer> map = new ArrayList<>();
-    
+
     public ABNFmap() {
         name = "略";
     }
-    
+
     public ABNFmap(String val) {
         FrontPacket pac = pac(val);
-        while ( pac.size() > 0 ) {
+        while (pac.size() > 0) {
             int ch = CodePoint.utf8(pac);
-            if ( !map.contains(ch)) {
+            if (!map.contains(ch)) {
                 map.add(ch);
             }
         }
     }
 
     @Override
     public Packet is(FrontPacket pac) {
-        if ( pac.length() == 0 ) {
+        if (pac.length() == 0) {
             return null;
         }
         int ch = CodePoint.utf8(pac);
@@ -52,34 +52,34 @@ public ABNF copy(ABNFReg reg) {
         nm.map.addAll(map);
         return nm;
     }
-    
+
     @Override
     public ABNF or(ABNF... abnf) {
         List<Integer> tmap = new ArrayList<>();
-        List<ABNF> xabnf = new ArrayList();
+        List<ABNF> xabnf = new ArrayList<>();
         boolean n = true;
-        for ( ABNF a : abnf ) {
-            if ( n && a instanceof ABNFbin ) {
-                int ach = ((ABNFbin)a).ch();
-                if ( ach >= 0 && !map.contains(ach)) {
+        for (ABNF a : abnf) {
+            if (n && a instanceof ABNFbin) {
+                int ach = ((ABNFbin) a).ch();
+                if (ach >= 0 && !map.contains(ach)) {
                     tmap.add(((ABNFbin) a).ch());
                 }
             } else {
                 n = false;
                 xabnf.add(a);
             }
         }
-        if ( n ) {
+        if (n) {
             ABNFmap nm = new ABNFmap();
             nm.map.addAll(map);
             nm.map.addAll(tmap);
-            if (xabnf.isEmpty() ) {
+            if (xabnf.isEmpty()) {
                 return nm;
             }
-            xabnf.add(0,nm);
+            xabnf.add(0, nm);
             return new ABNFor(xabnf.toArray(new ABNF[0]));
         }
         return super.or(abnf);
     }
-    
+
 }
diff --git a/src/main/java/net/siisise/abnf/ABNFmn.java b/src/main/java/net/siisise/abnf/ABNFmn.java
@@ -7,27 +7,28 @@
  * ABNFにはないがマイナス演算
  */
 public class ABNFmn extends IsABNF {
+
     private final ABNF a;
     private final ABNF b;
-    
+
     ABNFmn(ABNF a, ABNF b) {
         this.a = a;
         this.b = b;
     }
 
     @Override
     public ABNFmn copy(ABNFReg reg) {
-        return new ABNFmn(a.copy(reg),b.copy(reg));
+        return new ABNFmn(a.copy(reg), b.copy(reg));
     }
 
     @Override
     public Packet is(FrontPacket pac) {
         Packet p1 = a.is(pac);
-        if ( p1 == null ) {
+        if (p1 == null) {
             return null;
         }
         Packet p2 = b.is(p1);
-        if ( p2 != null ) {
+        if (p2 != null) {
             pac.dbackWrite(p1.toByteArray());
             pac.dbackWrite(p2.toByteArray());
             return null;

diff --git a/src/main/java/net/siisise/abnf/ABNFor.java b/src/main/java/net/siisise/abnf/ABNFor.java
@@ -26,6 +26,7 @@ public ABNFor(String n, ABNF... abnfs) {
     /**
      * text として
      * ABNFmap 推奨
+     *
      * @param chlist
      */
     public ABNFor(String chlist) {

diff --git a/src/main/java/net/siisise/abnf/ABNFplu.java b/src/main/java/net/siisise/abnf/ABNFplu.java
@@ -10,7 +10,7 @@
  *
  */
 public class ABNFplu extends ABNFplm {
-    
+
     public ABNFplu(ABNF[] list) {
         super(list);
     }
@@ -40,7 +40,7 @@ protected <X> C<X> longfind(FrontPacket pac, ABNF[] list, BNFParser<? extends X>
             return new C();
         }
         int flen = pac.size();
-        
+
         do {
             // 1つめ 指定サイズまでに制限する
             Packet frontPac = new PacketA();
@@ -68,7 +68,7 @@ protected <X> C<X> longfind(FrontPacket pac, ABNF[] list, BNFParser<? extends X>
             pac.dbackWrite(sdata);
             // ToDo: utf-8で1文字戻る版にしてみた
             flen--;
-            while ( flen >= 0 && (sdata[flen] & 0xc0) == 0x80 ) {
+            while (flen >= 0 && (sdata[flen] & 0xc0) == 0x80) {
                 flen--;
             }
 

diff --git a/src/main/java/net/siisise/abnf/ABNFtext.java b/src/main/java/net/siisise/abnf/ABNFtext.java
@@ -15,8 +15,8 @@ public class ABNFtext extends IsABNF {
     private final byte[] utf8;
 
     /**
-     * 
-     * @param ch 
+     *
+     * @param ch
      */
     ABNFtext(int ch) {
         char[] chars = Character.toChars(ch);

diff --git a/src/main/java/net/siisise/abnf/ABNFx.java b/src/main/java/net/siisise/abnf/ABNFx.java
@@ -5,7 +5,7 @@
 
 /**
  * ループの結果は最長だけでなく、各長さで判定したいこともあり
- * @author okome
+ *
  */
 public class ABNFx extends FindABNF {
 

diff --git a/src/main/java/net/siisise/abnf/FindABNF.java b/src/main/java/net/siisise/abnf/FindABNF.java
@@ -18,27 +18,29 @@ public Packet is(FrontPacket src) {
         }
         return ret.ret;
     }
-    
+
     /**
      * 詰め方の工夫をするターン
+     *
      * @param <X>
      * @param pac
      * @param parsers
-     * @return 
+     * @return
      */
     @Override
     public <X> C<X> find(FrontPacket pac, BNFParser<? extends X>... parsers) {
         BNFParser<? extends X> mp = matchParser(parsers);
         C<X> ret = buildFind(pac, mp == null ? parsers : new BNFParser[0]);
         return ret != null ? subBuild(ret, mp) : null;
     }
-    
+
     /**
      * find本体
+     *
      * @param <X>
      * @param pac
      * @param parsers
-     * @return 
+     * @return
      */
     abstract <X> C<X> buildFind(FrontPacket pac, BNFParser<? extends X>... parsers);
 }
diff --git a/src/main/java/net/siisise/bnf/AbstractBNF.java b/src/main/java/net/siisise/bnf/AbstractBNF.java
@@ -35,7 +35,7 @@ public BNF name(String name) {
 
     protected <X> BNFParser<? extends X> matchParser(BNFParser<? extends X>[] parsers) {
         for (BNFParser ps : parsers) {
-            if(name.equals(ps.getBNF().getName())) {
+            if (name.equals(ps.getBNF().getName())) {
                 return ps;
             }
         }
@@ -46,9 +46,11 @@ protected <X> BNFParser<? extends X> matchParser(BNFParser<? extends X>[] parser
     public boolean is(String val) {
         return is(pac(val)) != null;
     }
-    
+
     class BNFPacketParser implements BNFParser {
+
         BNF rule;
+
         BNFPacketParser(BNF rule) {
             this.rule = rule;
         }
@@ -68,7 +70,7 @@ public Object parse(String src) {
             return pac(src);
         }
     }
-    
+
     public boolean eq(FrontPacket val) {
         Packet r = is(val);
         if (val.length() == 0) {
@@ -79,11 +81,11 @@ public boolean eq(FrontPacket val) {
         }
         return false;
     }
-    
+
     public boolean eq(String val) {
         return eq(pac(val));
     }
-    
+
     public static FrontPacket pac(String str) {
         //Packet p = new PacketA();
         //p.write(str.getBytes(UTF8));
@@ -110,6 +112,7 @@ public static String strd(FrontPacket pac) {
 
     /**
      * 名前が該当すればそれ以下を削除して詰め直す
+     *
      * @param <X>
      * @param cret
      * @param parser 一致するものだけ必要

diff --git a/src/main/java/net/siisise/bnf/BNFReg.java b/src/main/java/net/siisise/bnf/BNFReg.java
@@ -1,14 +1,13 @@
-package net.siisise.bnf;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author okome
- */
-public class BNFReg {
-    Map<String,BNF> REG = new HashMap<>();
-
-
-}
+package net.siisise.bnf;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ */
+public class BNFReg {
+    Map<String,BNF> REG = new HashMap<>();
+
+
+}
diff --git a/src/main/java/net/siisise/bnf/BNFtext.java b/src/main/java/net/siisise/bnf/BNFtext.java
@@ -1,9 +1,8 @@
-package net.siisise.bnf;
-
-/**
- *
- * @author okome
- */
-public class BNFtext {
-
-}
+package net.siisise.bnf;
+
+/**
+ *
+ */
+public class BNFtext {
+
+}