Skip to content

Commit 1609470

Browse files
committedFeb 13, 2025·
[SYSTEMDS-3838] Fix unsupported expressions of boolean literals
This patch removes an unnecessary parser error when encountering binary expressions of boolean literals. Internally we anyway handle such expressions (which often occur after constant propagation).
1 parent 6653ced commit 1609470

File tree

3 files changed

+86
-6
lines changed

3 files changed

+86
-6
lines changed
 

‎src/main/java/org/apache/sysds/parser/DMLTranslator.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -1835,14 +1835,12 @@ private Hop processBooleanExpression(BooleanExpression source, DataIdentifier ta
18351835
constRight = (source.getRight().getOutput() instanceof ConstIdentifier);
18361836
}
18371837

1838-
if (constLeft || constRight) {
1839-
throw new RuntimeException(source.printErrorLocation() + "Boolean expression with constant unsupported");
1840-
}
1841-
1842-
Hop left = processExpression(source.getLeft(), null, hops);
1838+
Hop left = !constLeft ? processExpression(source.getLeft(), null, hops) :
1839+
new LiteralOp(Boolean.valueOf(source.getLeft().getText().toLowerCase()));
18431840
Hop right = null;
18441841
if (source.getRight() != null) {
1845-
right = processExpression(source.getRight(), null, hops);
1842+
right = !constRight ? processExpression(source.getRight(), null, hops) :
1843+
new LiteralOp(Boolean.valueOf(source.getRight().getText().toLowerCase()));
18461844
}
18471845

18481846
//prepare target identifier and ensure that output type is boolean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.sysds.test.functions.misc;
21+
22+
import static org.junit.Assert.assertTrue;
23+
import static org.junit.Assert.fail;
24+
25+
import org.apache.sysds.test.AutomatedTestBase;
26+
import org.apache.sysds.test.TestConfiguration;
27+
import org.apache.sysds.test.TestUtils;
28+
import org.junit.Test;
29+
30+
public class BooleanExpressionTest extends AutomatedTestBase {
31+
private final static String TEST_NAME1 = "booleanExpr";
32+
private final static String TEST_DIR = "functions/misc/";
33+
private final static String TEST_CLASS_DIR = TEST_DIR + BooleanExpressionTest.class.getSimpleName() + "/";
34+
35+
@Override
36+
public void setUp() {
37+
TestUtils.clearAssertionInformation();
38+
addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] {}));
39+
}
40+
41+
@Test
42+
public void testPrintNotExpressionTest() {
43+
TestConfiguration config = getTestConfiguration(TEST_NAME1);
44+
loadTestConfiguration(config);
45+
String HOME = SCRIPT_DIR + TEST_DIR;
46+
fullDMLScriptName = HOME + TEST_NAME1 + ".dml";
47+
try{
48+
programArgs = new String[]{};
49+
setOutputBuffering(true);
50+
String out = runTest(null).toString();
51+
assertTrue(out.contains("FALSE\nTRUE")
52+
|| out.contains("FALSE\r\nTRUE"));
53+
}
54+
catch(Exception e){
55+
e.printStackTrace();
56+
fail();
57+
}
58+
}
59+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#-------------------------------------------------------------
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The ASF licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing,
14+
# software distributed under the License is distributed on an
15+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
# KIND, either express or implied. See the License for the
17+
# specific language governing permissions and limitations
18+
# under the License.
19+
#
20+
#-------------------------------------------------------------
21+
22+
print(TRUE & FALSE);
23+
print(TRUE & !FALSE);

0 commit comments

Comments
 (0)
Please sign in to comment.