update deps

This results in the removal of Literal
katydid · Jan 23, 2025 · 7811c93 · 7811c93
1 parent 2576a8d
commit 7811c93
Show file tree

Hide file tree

Showing 588 changed files with 975 additions and 3,193 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/katydid/parser-go-json v0.1.0
 	github.com/katydid/parser-go-proto v0.1.0
 	github.com/katydid/parser-go-xml v0.1.0
-	github.com/katydid/validator-go v0.5.1
+	github.com/katydid/validator-go v0.5.3
 	google.golang.org/protobuf v1.36.3
 )
 

diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/katydid/parser-go-proto v0.1.0 h1:cnS9dtjZkZ4dYiivy56tHvVja0gV8b04QY4
 github.com/katydid/parser-go-proto v0.1.0/go.mod h1:yBWqastp7U/qi8qJqM1qIl3yfP8CTtiUnothslx+NGs=
 github.com/katydid/parser-go-xml v0.1.0 h1:8AL0X9hQbNLbQeqRbOdKBOwx4WTSWjy7kxEMmWqHMXc=
 github.com/katydid/parser-go-xml v0.1.0/go.mod h1:7rEHS3YuEv/8/ep+uQnLgcvT1znZs8JEc3ZaBbpygjA=
-github.com/katydid/validator-go v0.5.1 h1:XgLkSO62OFjcS7hmN8RTj0gHpMBdYRTAkiVtM59SV7E=
-github.com/katydid/validator-go v0.5.1/go.mod h1:ZVsNg5NEwcOJT2ukTrCu/jKKuNiTRS/4sw4cMNr9vh8=
+github.com/katydid/validator-go v0.5.3 h1:BIih2itiMTakOrazsfg4hFL6Tz3lPeOqN9+Y+0UdhBE=
+github.com/katydid/validator-go v0.5.3/go.mod h1:ZVsNg5NEwcOJT2ukTrCu/jKKuNiTRS/4sw4cMNr9vh8=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=

diff --git a/validator/gen-validator-tests/main.go b/validator/gen-validator-tests/main.go
@@ -43,7 +43,6 @@ func main() {
 		folder := filepath.Join(codecFolder, v.Name)
 		createFolder(folder)
 
-		v.Grammar.Format()
 		writeFile(
 			filepath.Join(folder, "validator.txt"),
 			[]byte(v.Grammar.String()),
@@ -84,7 +83,6 @@ func main() {
 		folder := filepath.Join(codecFolder, v.Name)
 		createFolder(folder)
 
-		v.Grammar.Format()
 		writeFile(
 			filepath.Join(folder, "validator.txt"),
 			[]byte(v.Grammar.String()),

diff --git a/validator/tests/goreflect/APocketRoses/validator.json b/validator/tests/goreflect/APocketRoses/validator.json
@@ -30,7 +30,6 @@
 											},
 											"Expr": {
 												"Terminal": {
-													"Literal": "\"a\"",
 													"StringValue": "a"
 												}
 											}

diff --git a/validator/tests/goreflect/APocketRoses/validator.xml b/validator/tests/goreflect/APocketRoses/validator.xml
@@ -32,7 +32,6 @@
 											</Symbol>
 											<Expr>
 												<Terminal>
-													<Literal>&#34;a&#34;</Literal>
 													<StringValue>a</StringValue>
 													<BytesValue></BytesValue>
 												</Terminal>

diff --git a/validator/tests/goreflect/Ab21InAnyExceptSaladWorry/validator.json b/validator/tests/goreflect/Ab21InAnyExceptSaladWorry/validator.json
@@ -48,7 +48,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"a\"",
 															"StringValue": "a"
 														}
 													}

diff --git a/validator/tests/goreflect/Ab21InAnyExceptSaladWorry/validator.xml b/validator/tests/goreflect/Ab21InAnyExceptSaladWorry/validator.xml
@@ -50,7 +50,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;a&#34;</Literal>
 															<StringValue>a</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/Ab21MagazineFrameA/validator.json b/validator/tests/goreflect/Ab21MagazineFrameA/validator.json
@@ -49,7 +49,6 @@
 																	},
 																	"Expr": {
 																		"Terminal": {
-																			"Literal": "\"a\"",
 																			"StringValue": "a"
 																		}
 																	}

diff --git a/validator/tests/goreflect/Ab21MagazineFrameA/validator.xml b/validator/tests/goreflect/Ab21MagazineFrameA/validator.xml
@@ -51,7 +51,6 @@
 																	</Symbol>
 																	<Expr>
 																		<Terminal>
-																			<Literal>&#34;a&#34;</Literal>
 																			<StringValue>a</StringValue>
 																			<BytesValue></BytesValue>
 																		</Terminal>

diff --git a/validator/tests/goreflect/Ab21MagazineFrameSingleA/validator.json b/validator/tests/goreflect/Ab21MagazineFrameSingleA/validator.json
@@ -35,7 +35,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"a\"",
 															"StringValue": "a"
 														}
 													}

diff --git a/validator/tests/goreflect/Ab21MagazineFrameSingleA/validator.xml b/validator/tests/goreflect/Ab21MagazineFrameSingleA/validator.xml
@@ -37,7 +37,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;a&#34;</Literal>
 															<StringValue>a</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/Ab21NotAFieldName/validator.json b/validator/tests/goreflect/Ab21NotAFieldName/validator.json
@@ -62,7 +62,6 @@
 																	},
 																	"Expr": {
 																		"Terminal": {
-																			"Literal": "\"a\"",
 																			"StringValue": "a"
 																		}
 																	}

diff --git a/validator/tests/goreflect/Ab21NotAFieldName/validator.xml b/validator/tests/goreflect/Ab21NotAFieldName/validator.xml
@@ -64,7 +64,6 @@
 																	</Symbol>
 																	<Expr>
 																		<Terminal>
-																			<Literal>&#34;a&#34;</Literal>
 																			<StringValue>a</StringValue>
 																			<BytesValue></BytesValue>
 																		</Terminal>

diff --git a/validator/tests/goreflect/Ab21Spirit1/validator.json b/validator/tests/goreflect/Ab21Spirit1/validator.json
@@ -74,7 +74,6 @@
 									},
 									"Expr": {
 										"Terminal": {
-											"Literal": "1",
 											"IntValue": 1
 										}
 									}

diff --git a/validator/tests/goreflect/Ab21Spirit1/validator.xml b/validator/tests/goreflect/Ab21Spirit1/validator.xml
@@ -72,7 +72,6 @@
 								</Symbol>
 								<Expr>
 									<Terminal>
-										<Literal>1</Literal>
 										<IntValue>1</IntValue>
 										<BytesValue></BytesValue>
 									</Terminal>

diff --git a/validator/tests/goreflect/Ab21Spirit2/validator.json b/validator/tests/goreflect/Ab21Spirit2/validator.json
@@ -74,7 +74,6 @@
 									},
 									"Expr": {
 										"Terminal": {
-											"Literal": "2",
 											"IntValue": 2
 										}
 									}

diff --git a/validator/tests/goreflect/Ab21Spirit2/validator.xml b/validator/tests/goreflect/Ab21Spirit2/validator.xml
@@ -72,7 +72,6 @@
 								</Symbol>
 								<Expr>
 									<Terminal>
-										<Literal>2</Literal>
 										<IntValue>2</IntValue>
 										<BytesValue></BytesValue>
 									</Terminal>

diff --git a/validator/tests/goreflect/AbcPocketRoses/validator.json b/validator/tests/goreflect/AbcPocketRoses/validator.json
@@ -30,7 +30,6 @@
 											},
 											"Expr": {
 												"Terminal": {
-													"Literal": "\"a\"",
 													"StringValue": "a"
 												}
 											}
@@ -64,7 +63,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"b\"",
 															"StringValue": "b"
 														}
 													}
@@ -96,7 +94,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"c\"",
 															"StringValue": "c"
 														}
 													}

diff --git a/validator/tests/goreflect/AbcPocketRoses/validator.xml b/validator/tests/goreflect/AbcPocketRoses/validator.xml
@@ -32,7 +32,6 @@
 											</Symbol>
 											<Expr>
 												<Terminal>
-													<Literal>&#34;a&#34;</Literal>
 													<StringValue>a</StringValue>
 													<BytesValue></BytesValue>
 												</Terminal>
@@ -68,7 +67,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;b&#34;</Literal>
 															<StringValue>b</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>
@@ -102,7 +100,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;c&#34;</Literal>
 															<StringValue>c</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/AndAnyName/validator.json b/validator/tests/goreflect/AndAnyName/validator.json
@@ -30,7 +30,6 @@
 											},
 											"Expr": {
 												"Terminal": {
-													"Literal": "\"0123456789\"",
 													"StringValue": "0123456789"
 												}
 											}
@@ -71,7 +70,6 @@
 											},
 											"Expr": {
 												"Terminal": {
-													"Literal": "\"David\"",
 													"StringValue": "David"
 												}
 											}

diff --git a/validator/tests/goreflect/AndAnyName/validator.xml b/validator/tests/goreflect/AndAnyName/validator.xml
@@ -30,7 +30,6 @@
 											</Symbol>
 											<Expr>
 												<Terminal>
-													<Literal>&#34;0123456789&#34;</Literal>
 													<StringValue>0123456789</StringValue>
 													<BytesValue></BytesValue>
 												</Terminal>
@@ -72,7 +71,6 @@
 											</Symbol>
 											<Expr>
 												<Terminal>
-													<Literal>&#34;David&#34;</Literal>
 													<StringValue>David</StringValue>
 													<BytesValue></BytesValue>
 												</Terminal>

diff --git a/validator/tests/goreflect/AndNameTelephoneDavid/validator.json b/validator/tests/goreflect/AndNameTelephoneDavid/validator.json
@@ -40,7 +40,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"David\"",
 															"StringValue": "David"
 														}
 													}
@@ -106,7 +105,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"0123456789\"",
 															"StringValue": "0123456789"
 														}
 													}

diff --git a/validator/tests/goreflect/AndNameTelephoneDavid/validator.xml b/validator/tests/goreflect/AndNameTelephoneDavid/validator.xml
@@ -41,7 +41,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;David&#34;</Literal>
 															<StringValue>David</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>
@@ -109,7 +108,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;0123456789&#34;</Literal>
 															<StringValue>0123456789</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/AndNameTelephoneJohn/validator.json b/validator/tests/goreflect/AndNameTelephoneJohn/validator.json
@@ -40,7 +40,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"David\"",
 															"StringValue": "David"
 														}
 													}
@@ -106,7 +105,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"0123456789\"",
 															"StringValue": "0123456789"
 														}
 													}

diff --git a/validator/tests/goreflect/AndNameTelephoneJohn/validator.xml b/validator/tests/goreflect/AndNameTelephoneJohn/validator.xml
@@ -41,7 +41,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;David&#34;</Literal>
 															<StringValue>David</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>
@@ -109,7 +108,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;0123456789&#34;</Literal>
 															<StringValue>0123456789</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/AndNameTelephoneMover/validator.json b/validator/tests/goreflect/AndNameTelephoneMover/validator.json
@@ -40,7 +40,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"David\"",
 															"StringValue": "David"
 														}
 													}
@@ -106,7 +105,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"0123456789\"",
 															"StringValue": "0123456789"
 														}
 													}

diff --git a/validator/tests/goreflect/AndNameTelephoneMover/validator.xml b/validator/tests/goreflect/AndNameTelephoneMover/validator.xml
@@ -41,7 +41,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;David&#34;</Literal>
 															<StringValue>David</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>
@@ -109,7 +108,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;0123456789&#34;</Literal>
 															<StringValue>0123456789</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/AndNameTelephoneSmith/validator.json b/validator/tests/goreflect/AndNameTelephoneSmith/validator.json
@@ -40,7 +40,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"David\"",
 															"StringValue": "David"
 														}
 													}
@@ -106,7 +105,6 @@
 													},
 													"Expr": {
 														"Terminal": {
-															"Literal": "\"0123456789\"",
 															"StringValue": "0123456789"
 														}
 													}

diff --git a/validator/tests/goreflect/AndNameTelephoneSmith/validator.xml b/validator/tests/goreflect/AndNameTelephoneSmith/validator.xml
@@ -41,7 +41,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;David&#34;</Literal>
 															<StringValue>David</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>
@@ -109,7 +108,6 @@
 													</Symbol>
 													<Expr>
 														<Terminal>
-															<Literal>&#34;0123456789&#34;</Literal>
 															<StringValue>0123456789</StringValue>
 															<BytesValue></BytesValue>
 														</Terminal>

diff --git a/validator/tests/goreflect/BightTurn/validator.json b/validator/tests/goreflect/BightTurn/validator.json
@@ -42,7 +42,6 @@
 											},
 											"Expr": {
 												"Terminal": {
-													"Literal": "true",
 													"BoolValue": true
 												}
 											}

diff --git a/validator/tests/goreflect/BightTurn/validator.xml b/validator/tests/goreflect/BightTurn/validator.xml
@@ -43,7 +43,6 @@
 											</Symbol>
 											<Expr>
 												<Terminal>
-													<Literal>true</Literal>
 													<BoolValue>true</BoolValue>
 													<BytesValue></BytesValue>
 												</Terminal>

diff --git a/validator/tests/goreflect/ContextDavid/validator.json b/validator/tests/goreflect/ContextDavid/validator.json
@@ -47,7 +47,6 @@
 															},
 															"Expr": {
 																"Terminal": {
-																	"Literal": "456",
 																	"IntValue": 456
 																}
 															}
@@ -79,7 +78,6 @@
 															},
 															"Expr": {
 																"Terminal": {
-																	"Literal": "\"TheStreet\"",
 																	"StringValue": "TheStreet"
 																}
 															}