リリースのv1.2.1

okomeki · Nov 30, 2022 · 516190a · 516190a
1 parent 6aa4502
commit 516190a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # SoftLibABNF Augmented BNF for Java ライブラリ
 
 Twitter @okomeki
+Mastodon @okome@oransns.com
 
 ## 概要 about
 
@@ -68,11 +69,14 @@ pom.xml に次のように追加します
 <dependency>
     <groupId>net.siisise<groupId>
     <artifactId>softlib-abnf</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <type>jar</type>
 </dependency>
 ~~~
 
+リリース版 1.2.1 ぐらい。
+次版 1.2.2-SNAPSHOT
+
 ## 演算子 Operators
 
 3.演算子のものをJavaで書く手法です。不明であればABNFでも書けます。

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.siisise</groupId>
     <artifactId>softlib-abnf</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
     <name>SoftLibABNF</name>
     <description>Java ABNF parser CC</description>
@@ -92,25 +92,25 @@
         <dependency>
             <groupId>net.siisise</groupId>
             <artifactId>softlib</artifactId>
-            <version>1.1.7-SNAPSHOT</version>
+            <version>[1.1.7,)</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>[5.8.2,)</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>[5.8.2,)</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.8.2,)</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/net/siisise/abnf/parser5234/ABNF5234.java b/src/main/java/net/siisise/abnf/parser5234/ABNF5234.java
@@ -70,7 +70,7 @@ public class ABNF5234 {
     public static final ABNF repeat = REG.rule("repeat", BNFStringParser.class, DIGIT.x().pl(ABNF.bin('*'), DIGIT.x()).or1(DIGIT.ix()));
     public static final ABNF repetition = REG.rule("repetition", Repetition.class, repeat.c().pl(REG.ref("element")));
     static final ABNF cNl = REG.rule("c-nl", comment.or1(CRLF));
-    static final ABNF cWsp = REG.rule("c-wsp", WSP.or(cNl.pl(WSP)));
+    static final ABNF cWsp = REG.rule("c-wsp", WSP.or1(cNl.pl(WSP)));
     public static final ABNF concatenation = REG.rule("concatenation", Concatenation.class, repetition.pl(cWsp.ix().pl(repetition).x()));
     public static final ABNF alternation = REG.rule("alternation", Alternation.class, concatenation.pl(cWsp.x().pl(ABNF.text('/'), cWsp.x(), concatenation).x()));
     public static final ABNF group = REG.rule("group", SubAlternation.class, ABNF.bin('(').pl(cWsp.x(), alternation, cWsp.x(), ABNF.bin(')')));
@@ -79,7 +79,7 @@ public class ABNF5234 {
     public static final ABNF elements = REG.rule("elements", SubAlternation.class, alternation.pl(cWsp.x()));
     public static final ABNF definedAs = REG.rule("defined-as", BNFStringParser.class, cWsp.x().pl(ABNF.bin('=').or(ABNF.bin("=/")), cWsp.x()));
     public static final ABNF rule = REG.rule("rule", Rule.class, rulename.pl(definedAs, elements, cNl));
-    public static final ABNF rulelist = REG.rule("rulelist", Rulelist.class, rule.or(cWsp.x().pl(cNl)).ix());
+    public static final ABNF rulelist = REG.rule("rulelist", Rulelist.class, rule.or1(cWsp.x().pl(cNl)).ix());
 
     /**
      * 複製できる弱結合版
@@ -109,7 +109,7 @@ public static ABNFCC copyREG() {
         reg.rule("elements", SubAlternation.class, reg.ref("alternation").pl(cWsp.x()));
         reg.rule("defined-as", BNFStringParser.class, ABNF5234.definedAs);
         reg.rule("rule", Rule.class, reg.ref("rulename").pl(definedAs, reg.ref("elements"), cNl));
-        reg.rule("rulelist", Rulelist.class, reg.ref("rule").or(cWsp.x().pl(cNl)).ix());
+        reg.rule("rulelist", Rulelist.class, reg.ref("rule").or1(cWsp.x().pl(cNl)).ix());
 
         return reg;
     }

diff --git a/src/main/java/net/siisise/bnf/parser5234/ABNF5234.java b/src/main/java/net/siisise/bnf/parser5234/ABNF5234.java
@@ -87,7 +87,7 @@ public class ABNF5234 {
     public static final BNF elements = REG.rule("elements", SubAlternation.class, alternation.pl(cWsp.x()));
     public static final BNF definedAs = REG.rule("defined-as", BNFStringParser.class, cWsp.x().pl(BNF.bin('=').or(BNF.bin("=/")), cWsp.x()));
     public static final BNF rule = REG.rule("rule", Rule.class, rulename.pl(definedAs, elements, cNl));
-    public static final BNF rulelist = REG.rule("rulelist", Rulelist.class, rule.or(cWsp.x().pl(cNl)).ix());
+    public static final BNF rulelist = REG.rule("rulelist", Rulelist.class, rule.or1(cWsp.x().pl(cNl)).ix());
 
     /**
      * 複製できる弱結合版
@@ -117,7 +117,7 @@ public static BNFCC<BNF> copyREG() {
         reg.rule("elements", SubAlternation.class, reg.ref("alternation").pl(cWsp.x()));
         reg.rule("defined-as", BNFStringParser.class, ABNF5234.definedAs);
         reg.rule("rule", Rule.class, reg.ref("rulename").pl(definedAs, reg.ref("elements"), cNl));
-        reg.rule("rulelist", Rulelist.class, reg.ref("rule").or(cWsp.x().pl(cNl)).ix());
+        reg.rule("rulelist", Rulelist.class, reg.ref("rule").or1(cWsp.x().pl(cNl)).ix());
 
         return reg;
     }