Minor bug fixes.

Author: Alexhuszagh

docker/android-system.sh

@@ -599,8 +599,7 @@ print(f"{major}.{minor}")')
     mkdir -p "${PYTHON_TMPDIR}"
     python3 -m pip install sly==0.4.0 --prefix "${PYTHON_TMPDIR}"
 
-    python3 "${PYTHON_TMPDIR}/scripts/build-system.py \
-        remove_tests.py" \
+    python3 "${PYTHON_TMPDIR}/scripts/build-system.py" \
         --remove-tests \
         --verbose
 }

docker/android/android/soong.py

@@ -220,7 +220,7 @@ def sequence(self, prod):
     def sequence(self, prod):
         return [prod.list_item]
 
-    @_('string PLUS list_item')
+    @_('list_item PLUS list_item')
     def list_item(self, prod):
         return BinaryOperator(prod[0], '+', prod[2])
 

docker/android/tests/Addition.bp

@@ -51,3 +51,12 @@ tri_list = ["value0"] + ["value1"] + ["value2"]
 tri_scope = {} + {
     name: "target",
 } + {}
+// test sequence lhs and rhs strings
+home = "dir/"
+test = "test.c"
+
+files = [
+    home + "file.c",
+    "test/" + test,
+    home + test,
+]

docker/android/tests/test_soong.py

@@ -70,7 +70,7 @@ def test():
 def test_addition():
     path = os.path.join(TEST_DIR, 'Addition.bp')
     ast = soong.load(open(path))
-    assert len(ast) == 24
+    assert len(ast) == 27
     assert ast[0].is_assignment()
     assert ast[1].is_binary_operator_assignment()
     assert ast[2].is_assignment()
@@ -114,6 +114,25 @@ def test_addition():
     assert ast[20].expr.op == '+'
     assert ast[20].expr.rhs == 2
 
+    assert ast[26].name == 'files'
+    assert ast[26].expr.is_list()
+    assert len(ast[26].expr) == 3
+
+    assert ast[26].expr[0].lhs == 'home'
+    assert ast[26].expr[0].lhs.is_ident()
+    assert ast[26].expr[0].rhs == 'file.c'
+    assert ast[26].expr[0].rhs.is_string()
+
+    assert ast[26].expr[1].lhs == 'test/'
+    assert ast[26].expr[1].lhs.is_string()
+    assert ast[26].expr[1].rhs == 'test'
+    assert ast[26].expr[1].rhs.is_ident()
+
+    assert ast[26].expr[2].lhs == 'home'
+    assert ast[26].expr[2].lhs.is_ident()
+    assert ast[26].expr[2].rhs == 'test'
+    assert ast[26].expr[2].rhs.is_ident()
+
 
 def test_empty():
     path = os.path.join(TEST_DIR, 'Empty.bp')