diff --git a/pom.xml b/pom.xml index 4ac36d2..9e0d74b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ 4.0.0 net.siisise - SoftLibABNF - 1.1.0 + softlib-abnf + 1.1.1 jar @@ -25,8 +25,8 @@ net.siisise - SoftLib - 1.1.0 + softlib + 1.1.1 jar @@ -48,6 +48,20 @@ test + + + github + GitHub okomeki Apache Maven SoftLib Packages + default + https://maven.pkg.github.com/okomeki/softlibabnf + + true + + + true + + + UTF-8 1.8 diff --git a/src/main/java/net/siisise/abnf/ABNFmap.java b/src/main/java/net/siisise/abnf/ABNFmap.java index 0c8aa55..9c4f7b1 100644 --- a/src/main/java/net/siisise/abnf/ABNFmap.java +++ b/src/main/java/net/siisise/abnf/ABNFmap.java @@ -14,16 +14,16 @@ public class ABNFmap extends IsABNF { private final List 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); } } @@ -31,7 +31,7 @@ public ABNFmap(String val) { @Override public Packet is(FrontPacket pac) { - if ( pac.length() == 0 ) { + if (pac.length() == 0) { return null; } int ch = CodePoint.utf8(pac); @@ -52,16 +52,16 @@ public ABNF copy(ABNFReg reg) { nm.map.addAll(map); return nm; } - + @Override public ABNF or(ABNF... abnf) { List tmap = new ArrayList<>(); - List xabnf = new ArrayList(); + List 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 { @@ -69,17 +69,17 @@ public ABNF or(ABNF... abnf) { 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 index f26fb49..ab6f4b6 100644 --- a/src/main/java/net/siisise/abnf/ABNFmn.java +++ b/src/main/java/net/siisise/abnf/ABNFmn.java @@ -7,9 +7,10 @@ * 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; @@ -17,17 +18,17 @@ public class ABNFmn extends IsABNF { @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 index f600959..eb48d38 100644 --- 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 index 62c3ba8..f5bcf5e 100644 --- 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 C longfind(FrontPacket pac, ABNF[] list, BNFParser return new C(); } int flen = pac.size(); - + do { // 1つめ 指定サイズまでに制限する Packet frontPac = new PacketA(); @@ -68,7 +68,7 @@ protected C longfind(FrontPacket pac, ABNF[] list, BNFParser 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 index c6adf9b..8fad0ca 100644 --- 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 index 679c004..63c89db 100644 --- 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 index 0f0c721..10fa05f 100644 --- a/src/main/java/net/siisise/abnf/FindABNF.java +++ b/src/main/java/net/siisise/abnf/FindABNF.java @@ -18,13 +18,14 @@ public Packet is(FrontPacket src) { } return ret.ret; } - + /** * 詰め方の工夫をするターン + * * @param * @param pac * @param parsers - * @return + * @return */ @Override public C find(FrontPacket pac, BNFParser... parsers) { @@ -32,13 +33,14 @@ public C find(FrontPacket pac, BNFParser... parsers) { C ret = buildFind(pac, mp == null ? parsers : new BNFParser[0]); return ret != null ? subBuild(ret, mp) : null; } - + /** * find本体 + * * @param * @param pac * @param parsers - * @return + * @return */ abstract C buildFind(FrontPacket pac, BNFParser... parsers); } diff --git a/src/main/java/net/siisise/bnf/AbstractBNF.java b/src/main/java/net/siisise/bnf/AbstractBNF.java index b128e9c..84ea53c 100644 --- 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 BNFParser matchParser(BNFParser[] parsers) { for (BNFParser ps : parsers) { - if(name.equals(ps.getBNF().getName())) { + if (name.equals(ps.getBNF().getName())) { return ps; } } @@ -46,9 +46,11 @@ protected BNFParser matchParser(BNFParser[] 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 * @param cret * @param parser 一致するものだけ必要 diff --git a/src/main/java/net/siisise/bnf/BNFReg.java b/src/main/java/net/siisise/bnf/BNFReg.java index 0aac15b..a00ef0a 100644 --- 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 REG = new HashMap<>(); - - -} +package net.siisise.bnf; + +import java.util.HashMap; +import java.util.Map; + +/** + * + */ +public class BNFReg { + Map REG = new HashMap<>(); + + +} diff --git a/src/main/java/net/siisise/bnf/BNFtext.java b/src/main/java/net/siisise/bnf/BNFtext.java index fe80ff7..bbe5c28 100644 --- 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 { + +}