fix: allow comments in more places in OPL (#1117)

Fixes #1116
ory · Nov 8, 2022 · 5f89fcf · 5f89fcf
1 parent 305f10b
commit 5f89fcf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/internal/schema/lexer.go b/internal/schema/lexer.go
@@ -187,6 +187,13 @@ func (l *lexer) nextItem() item {
 	}
 }
 
+// nextNonCommentItem returns the next item from the input that is not a comment.
+func (l *lexer) nextNonCommentItem() (item item) {
+	for item = l.nextItem(); item.Typ == itemComment; item = l.nextItem() {
+	}
+	return
+}
+
 // scanIdentifier scans an identifier.
 func (l *lexer) scanIdentifier() bool {
 	if !l.accept(letters) {

diff --git a/internal/schema/parser.go b/internal/schema/parser.go
@@ -36,16 +36,14 @@ func (p *parser) next() (item item) {
 		item = *p.lookahead
 		p.lookahead = nil
 	} else {
-		// Get next non-comment token.
-		for item = p.lexer.nextItem(); item.Typ == itemComment; item = p.lexer.nextItem() {
-		}
+		return p.lexer.nextNonCommentItem()
 	}
 	return
 }
 
 func (p *parser) peek() item {
 	if p.lookahead == nil {
-		i := p.lexer.nextItem()
+		i := p.lexer.nextNonCommentItem()
 		p.lookahead = &i
 		return i
 	}

diff --git a/internal/schema/parser_test.go b/internal/schema/parser_test.go
@@ -91,12 +91,12 @@ var parserTestCases = []struct {
 	permits = {
 	  view: (ctx: Context): boolean =>
 	    (
-		this.related.parents.traverse((p) =>
+		this.related.parents.traverse((p) /* comment */ =>
 		  p.related.viewers.includes(ctx.subject),
-		) &&
+		) && // comment
 		this.related.parents.traverse(p => p.permits.view(ctx)) ) ||
-		(this.related.viewers.includes(ctx.subject) ||
-		this.related.viewers.includes(ctx.subject) ||
+		(this.related.viewers.includes(ctx.subject) || // some comment
+		this.related.viewers.includes(ctx.subject) || /* another comment */
 		this.related.viewers.includes(ctx.subject) ) ||
 		this.related.owners.includes(ctx.subject),