Skip to content

Commit fad4d02

Browse files
authored
Revert "feat: allow undersores in variable names (#383)"
This reverts commit d6ea20b.
1 parent d6ea20b commit fad4d02

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

DynamoDbEncryption/dafny/DynamoDbEncryption/src/FilterExpr.dfy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,6 @@ module DynamoDBFilterExpr {
692692
true
693693
else if '0' <= ch <= '9' then
694694
true
695-
else if ch == '_' then
696-
true
697695
else
698696
false
699697
}

DynamoDbEncryption/dafny/DynamoDbEncryption/test/FilterExpr.dfy

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ module TestDynamoDBFilterExpr {
3333
expect_equal(ParseExpr("and"), [And]);
3434
expect_equal(ParseExpr(" AnD "), [And]);
3535
expect_equal(ParseExpr(" A AnD B "), [MakeAttr("A"), And, MakeAttr("B")]);
36-
expect_equal(ParseExpr(" A_B AnD B_C "), [MakeAttr("A_B"), And, MakeAttr("B_C")]);
3736

3837
var input := [Not, MakeAttr("A"), In, Open, MakeAttr("B"), Comma, MakeAttr("C"), Close, Or];
3938
expect IsIN(input[1..]);
@@ -96,13 +95,13 @@ module TestDynamoDBFilterExpr {
9695
method {:test} TestBasicParse() {
9796
var context := ExprContext (
9897
None,
99-
Some("std2 = :A AND #Field_4 = :B"),
98+
Some("std2 = :A AND #Field4 = :B"),
10099
Some(map[
101100
":A" := DDB.AttributeValue.N("1.23"),
102101
":B" := DDB.AttributeValue.S("abc")
103102
]),
104103
Some(map[
105-
"#Field_4" := "std4"
104+
"#Field4" := "std4"
106105
])
107106
);
108107
var version := GetLotsaBeacons();
@@ -118,7 +117,7 @@ module TestDynamoDBFilterExpr {
118117

119118
var newContext :- expect BeaconizeParsedExpr(beaconVersion, parsed, 0, context.values.value, context.names, DontUseKeys, map[]);
120119
var exprString := ParsedExprToString(newContext.expr);
121-
expect exprString == "aws_dbe_b_std2 = :A AND #Field_4 = :B";
120+
expect exprString == "aws_dbe_b_std2 = :A AND #Field4 = :B";
122121
}
123122

124123
method {:test} TestNoBeaconFail() {

0 commit comments

Comments
 (0)