Tidier IDENT syntax (#86)

arr-ai · Aug 8, 2020 · ccc5b81 · ccc5b81
1 parent ec2202a
commit ccc5b81
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -314,7 +314,7 @@ REF         -> "%" IDENT ("=" default=STR)?;
 COMMENT -> /{ //.*$
             | (?s: /\* (?: [^*] | \*+[^*/] ) \*/ )
             };
-IDENT   -> /{@|[A-Za-z_\.]\w*};
+IDENT   -> /{@|\.?[A-Za-z_]\w*};
 INT     -> \d+;
 STR     -> /{ " (?: \\. | [^\\"] )* "
             | ' (?: \\. | [^\\'] )* '

diff --git a/examples/wbnf.wbnf b/examples/wbnf.wbnf
@@ -19,7 +19,7 @@ REF         -> "%" IDENT ("=" default=STR)?;
 COMMENT -> /{ //.*$
             | (?s: /\* (?: [^*] | \*+[^*/] ) \*/ )
             };
-IDENT   -> /{@|[A-Za-z_\.]\w*};
+IDENT   -> /{@|\.?[A-Za-z_]\w*};
 INT     -> \d+;
 STR     -> /{ " (?: \\. | [^\\"] )* "
             | ' (?: \\. | [^\\'] )* '

diff --git a/parser/scope.go b/parser/scope.go
@@ -67,7 +67,8 @@ func (s Scope) ReplaceCutPoint(force bool) (newScope Scope, prev, replacement Cu
 	prev = s.GetCutPoint()
 	replacement = invalidCutpoint
 	if prev.valid() || force {
-		replacement = Cutpointdata(rand.Int31())
+		// TODO: What's with the random number?
+		replacement = Cutpointdata(rand.Int31()) //nolint:gosec
 		return s.With(cutpointkey, replacement), prev, replacement
 	}
 	return s, invalidCutpoint, invalidCutpoint

diff --git a/wbnf/wbnfgrammar.go b/wbnf/wbnfgrammar.go