chore: correct offset expressions in date-time expressions

pact-foundation · Aug 2, 2022 · 8a6095c · 8a6095c
1 parent a36ce77
commit 8a6095c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ort/src/main/antlr/au/com/dius/pact/core/support/generators/expressions/DateExpression.g4 b/...ort/src/main/antlr/au/com/dius/pact/core/support/generators/expressions/DateExpression.g4
@@ -8,13 +8,13 @@ expression returns [ DateBase dateBase = DateBase.NOW, List<Adjustment<DateOffse
     | op duration { if ($duration.d != null) $adj.add($duration.d.withOperation($op.o)); } ( op duration { if ($duration.d != null) $adj.add($duration.d.withOperation($op.o)); } )*
     | base { $dateBase = $base.t; } ( op duration { if ($duration.d != null) $adj.add($duration.d.withOperation($op.o)); } )*
     | 'next' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.PLUS)); }
-    | 'next' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.PLUS)); }  op duration {
+    | 'next' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.PLUS)); }  ( op duration {
         if ($duration.d != null) $adj.add($duration.d.withOperation($op.o));
-    }
+    } )*
     | 'last' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.MINUS)); }
-    | 'last' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.MINUS)); } (op duration {
+    | 'last' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.MINUS)); } ( op duration {
         if ($duration.d != null) $adj.add($duration.d.withOperation($op.o));
-    })*
+    } )*
     ) EOF
     ;
 

diff --git a/...ort/src/main/antlr/au/com/dius/pact/core/support/generators/expressions/TimeExpression.g4 b/...ort/src/main/antlr/au/com/dius/pact/core/support/generators/expressions/TimeExpression.g4
@@ -8,13 +8,13 @@ expression returns [ TimeBase timeBase = TimeBase.Now.INSTANCE, List<Adjustment<
     | op duration { if ($duration.d != null) $adj.add($duration.d.withOperation($op.o)); } ( op duration { if ($duration.d != null) $adj.add($duration.d.withOperation($op.o)); } )*
     | base { $timeBase = $base.t; } ( op duration { if ($duration.d != null) $adj.add($duration.d.withOperation($op.o)); } )*
     | 'next' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.PLUS)); }
-    | 'next' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.PLUS)); }  op duration {
+    | 'next' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.PLUS)); }  ( op duration {
         if ($duration.d != null) $adj.add($duration.d.withOperation($op.o));
-    }
+    } )*
     | 'last' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.MINUS)); }
-    | 'last' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.MINUS)); } (op duration {
+    | 'last' offset { $adj.add(new Adjustment($offset.type, $offset.val, Operation.MINUS)); } ( op duration {
         if ($duration.d != null) $adj.add($duration.d.withOperation($op.o));
-    })*
+    } )*
     ) EOF
     ;