Add support for multiple items

This resolves issue #3 and should also help with bug #6
dimitar-asenov · Mar 31, 2016 · 8c2642d · 8c2642d
1 parent 7c1c39e
commit 8c2642d
Showing 1 changed file with 116 additions and 3 deletions.
diff --git a/TopLevel/test {a093f653-58a1-4175-badd-d72d9d47ad73} b/TopLevel/test {a093f653-58a1-4175-badd-d72d9d47ad73}
@@ -25,11 +25,124 @@
  expression EmptyExpression {59b60020-4815-4cce-9bf2-97c5c146b2c0} {1b78a32f-ef04-4afe-b34d-bf84b962219e}
  3 ExpressionStatement {aefc7ef4-9280-431b-82e8-aade854c7711} {ee945e6e-2e69-4364-a939-6610948a79bb}
  expression EmptyExpression {0a8fa922-8831-4a43-ad5d-0764c15a3c50} {aefc7ef4-9280-431b-82e8-aade854c7711}
- 4 ExpressionStatement {c117e03f-fdcd-461e-995c-881b57c077a3} {ee945e6e-2e69-4364-a939-6610948a79bb}
+ 4 LoopStatement {4fdac042-1f62-4600-8995-61ae088d1359} {ee945e6e-2e69-4364-a939-6610948a79bb}
+ body StatementItemList {fc6d2468-29e4-4855-a32d-6cc79e031194} {4fdac042-1f62-4600-8995-61ae088d1359}
+ 0 ExpressionStatement {f900be65-6a71-4dec-a7f3-53e6b0f56bcf} {fc6d2468-29e4-4855-a32d-6cc79e031194}
+ expression VariableDeclarationExpression {725d49c3-309e-4a8f-8cbf-7ae0ed72e2cb} {f900be65-6a71-4dec-a7f3-53e6b0f56bcf}
+ decl VariableDeclaration {46e82a61-1d13-4fb5-b211-8fef0bc52b02} {725d49c3-309e-4a8f-8cbf-7ae0ed72e2cb}
+ annotations StatementItemList {16fb3a9b-00c5-41cf-8993-55835147d031} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}
+ initKind Integer {d9624dcf-e900-4b7e-97a0-a3a8db861ff4} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}. I_0
+ initialValue MethodCallExpression {f1d93e34-d490-4622-925b-ae3302642a29} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}
+ arguments TypedListOfExpression {9c202a08-0f8e-4693-babd-6dfbacdf9f5d} {f1d93e34-d490-4622-925b-ae3302642a29}
+ cKind Integer {ad35843c-0da0-4176-a7cd-f98b4859474f} {f1d93e34-d490-4622-925b-ae3302642a29}. I_0
+ callee ReferenceExpression {f0b17ac9-93f8-4e9f-ad58-960eea1e9f84} {f1d93e34-d490-4622-925b-ae3302642a29}
+ memKind Integer {976ec949-a806-44d4-b43f-457f6c52f811} {f0b17ac9-93f8-4e9f-ad58-960eea1e9f84}. I_0
+ prefix BinaryOperation {1319411b-47c4-4331-83fb-b25ce190e4cc} {f0b17ac9-93f8-4e9f-ad58-960eea1e9f84}
+ left ReferenceExpression {a2597a76-6a0c-404a-9070-2f6690c1298d} {1319411b-47c4-4331-83fb-b25ce190e4cc}
+ memKind Integer {a3c023f5-a424-46d2-8a64-35aff1a8fa54} {a2597a76-6a0c-404a-9070-2f6690c1298d}. I_0
+ ref OOReference {11fb6e0b-3382-49ae-80ac-9e4b5b536aef} {a2597a76-6a0c-404a-9070-2f6690c1298d}. S_{c01c5689-ef2a-463b-a3ef-dfee5c4a7217}:items
+ typeArguments TypedListOfExpression {88e28ca4-35c9-4181-9d71-6702b8d77f10} {a2597a76-6a0c-404a-9070-2f6690c1298d}
+ opr Integer {e0847dcb-23e1-4751-b1ea-d7426cddb83a} {1319411b-47c4-4331-83fb-b25ce190e4cc}. I_19
+ right ReferenceExpression {a4a5f95f-682c-4815-86dc-94759da7f77a} {1319411b-47c4-4331-83fb-b25ce190e4cc}
+ memKind Integer {98d64203-58da-41c2-9f6d-f9de27b9baa6} {a4a5f95f-682c-4815-86dc-94759da7f77a}. I_0
+ ref OOReference {6a58b372-8d0c-40d0-a880-b47642f5750c} {a4a5f95f-682c-4815-86dc-94759da7f77a}. S_{7d1619da-acb8-4652-8fa7-ccdfe833e8ff}:i
+ typeArguments TypedListOfExpression {b259d3c8-6cad-4962-80bd-86305a6b62f8} {a4a5f95f-682c-4815-86dc-94759da7f77a}
+ ref OOReference {de23b5a3-6532-465f-a44b-cbadcf47b88c} {f0b17ac9-93f8-4e9f-ad58-960eea1e9f84}. S_{ec4d781e-2f55-4559-b03f-17b638e393fc}:getData
+ typeArguments TypedListOfExpression {dd112c59-aa16-483d-a410-77d6aeee4654} {f0b17ac9-93f8-4e9f-ad58-960eea1e9f84}
+ metaCalls TypedListOfExpression {9af387e8-7da1-47bc-9ba4-71d4ce6b95d8} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}
+ modifiers Modifier {708e10df-961d-4e69-bc00-6d68681d92d9} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}. I_0
+ name NameText {c2017050-1092-4024-925f-385f7f05476f} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}. S_data
+ subDeclarations TypedListOfDeclaration {40446ed7-403c-4adc-969e-230a94458ba8} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}
+ typeExpression ReferenceExpression {faaac69b-82e0-4d98-a530-9625743c14d2} {46e82a61-1d13-4fb5-b211-8fef0bc52b02}
+ memKind Integer {fc13405a-8944-4ba6-9ec5-f2eb9b2b5b43} {faaac69b-82e0-4d98-a530-9625743c14d2}. I_0
+ ref OOReference {c1247e79-e652-4ad8-b97f-eeaaf66cc120} {faaac69b-82e0-4d98-a530-9625743c14d2}. S_{03c7e220-0eaa-41c2-a871-2d45b186a376}:ItemData
+ typeArguments TypedListOfExpression {42615513-f00c-473c-8348-29270776ad4e} {faaac69b-82e0-4d98-a530-9625743c14d2}
+ 1 ExpressionStatement {985f52cd-c2c5-4e06-9b70-ef26a18d84e9} {fc6d2468-29e4-4855-a32d-6cc79e031194}
+ expression MethodCallExpression {26788b33-dec6-4b41-ab50-8e6cb8b554d1} {985f52cd-c2c5-4e06-9b70-ef26a18d84e9}
+ arguments TypedListOfExpression {68de431c-cea4-4081-9f96-ccee0b968bb8} {26788b33-dec6-4b41-ab50-8e6cb8b554d1}
+ 0 ReferenceExpression {cb86df60-ffe4-4dbd-a352-74ca47cbd1ef} {68de431c-cea4-4081-9f96-ccee0b968bb8}
+ memKind Integer {0aa3c7a2-1cc6-4a92-bf43-a2cfb7cc63d3} {cb86df60-ffe4-4dbd-a352-74ca47cbd1ef}. I_0
+ ref OOReference {8406d2c8-d37c-4813-b1e0-b40d6c97dc11} {cb86df60-ffe4-4dbd-a352-74ca47cbd1ef}. S_{f900be65-6a71-4dec-a7f3-53e6b0f56bcf}:data
+ typeArguments TypedListOfExpression {6c7eaf96-c834-4d69-a081-ff7cad4e51ee} {cb86df60-ffe4-4dbd-a352-74ca47cbd1ef}
+ cKind Integer {a26bde1e-0b89-4f0d-9cf0-3badd1502f25} {26788b33-dec6-4b41-ab50-8e6cb8b554d1}. I_0
+ callee ReferenceExpression {7d8b3b96-d493-4acb-84aa-5d6761a2b257} {26788b33-dec6-4b41-ab50-8e6cb8b554d1}
+ memKind Integer {24597581-a4df-4f19-8977-fb807792d157} {7d8b3b96-d493-4acb-84aa-5d6761a2b257}. I_0
+ prefix ReferenceExpression {ec5f7653-408b-4e01-aba8-4495f859ad74} {7d8b3b96-d493-4acb-84aa-5d6761a2b257}
+ memKind Integer {9a127113-f3cd-4925-92d8-2001e14235ed} {ec5f7653-408b-4e01-aba8-4495f859ad74}. I_0
+ ref OOReference {65d0e006-67da-4753-a24b-1aa77c395412} {ec5f7653-408b-4e01-aba8-4495f859ad74}. S_{1c2b0f7f-fb3c-4153-84e0-4b9094dda424}:allData
+ typeArguments TypedListOfExpression {d57eb1f2-0685-43fc-828e-3e48744ea7e4} {ec5f7653-408b-4e01-aba8-4495f859ad74}
+ ref OOReference {015d3e10-d974-4e6a-87ac-666406f22cbc} {7d8b3b96-d493-4acb-84aa-5d6761a2b257}. S_____NULL____:add
+ typeArguments TypedListOfExpression {33ace91d-701a-4b86-ab0f-1a2e2b831918} {7d8b3b96-d493-4acb-84aa-5d6761a2b257}
+ 2 ExpressionStatement {73955dd1-67cf-4c48-957d-d91d800e299b} {fc6d2468-29e4-4855-a32d-6cc79e031194}
+ expression MethodCallExpression {7c9adc5c-4e48-40f7-b2b2-cb388cb17cc3} {73955dd1-67cf-4c48-957d-d91d800e299b}
+ arguments TypedListOfExpression {f30b7482-e93e-45c8-9081-5531398b4921} {7c9adc5c-4e48-40f7-b2b2-cb388cb17cc3}
+ cKind Integer {c7856eaa-5e3c-4c2a-b2b1-7f9bce31acd5} {7c9adc5c-4e48-40f7-b2b2-cb388cb17cc3}. I_0
+ callee ReferenceExpression {29d9bce0-609c-434d-a2de-87870d0916e9} {7c9adc5c-4e48-40f7-b2b2-cb388cb17cc3}
+ memKind Integer {a099b613-4f86-48d7-bd77-5c62c6e86a03} {29d9bce0-609c-434d-a2de-87870d0916e9}. I_0
+ prefix ReferenceExpression {98b85565-2c00-4eee-b9a8-49b063a86b39} {29d9bce0-609c-434d-a2de-87870d0916e9}
+ memKind Integer {c93cbef8-58f7-47e4-ab0e-440da90c068d} {98b85565-2c00-4eee-b9a8-49b063a86b39}. I_0
+ ref OOReference {8c528a65-3dbd-4225-8b35-a9fc1ed42dab} {98b85565-2c00-4eee-b9a8-49b063a86b39}. S_{f900be65-6a71-4dec-a7f3-53e6b0f56bcf}:data
+ typeArguments TypedListOfExpression {e9c6731f-3471-4df0-9989-e5cbd02ff2e3} {98b85565-2c00-4eee-b9a8-49b063a86b39}
+ ref OOReference {09e5acb6-488b-4e95-800a-325704a4ad56} {29d9bce0-609c-434d-a2de-87870d0916e9}. S_{f163748d-8e92-42d4-aeb8-4546f1b2d8f6}:detach
+ typeArguments TypedListOfExpression {5997f5f2-dced-4635-ab5c-efb3c4614512} {29d9bce0-609c-434d-a2de-87870d0916e9}
+ condition BinaryOperation {976cc6fe-97cf-4f47-98b8-45fad5b184a1} {4fdac042-1f62-4600-8995-61ae088d1359}
+ left ReferenceExpression {b65cbebe-00bc-4af0-8de1-0bb7b12d838b} {976cc6fe-97cf-4f47-98b8-45fad5b184a1}
+ memKind Integer {1f75fb88-8d52-4fc8-b2eb-e3d0f245738e} {b65cbebe-00bc-4af0-8de1-0bb7b12d838b}. I_0
+ ref OOReference {105008af-a283-4478-b1b7-b57a011b1822} {b65cbebe-00bc-4af0-8de1-0bb7b12d838b}. S_{7d1619da-acb8-4652-8fa7-ccdfe833e8ff}:i
+ typeArguments TypedListOfExpression {f093124e-1293-4105-ba7f-24ceeb7d5af2} {b65cbebe-00bc-4af0-8de1-0bb7b12d838b}
+ opr Integer {7fa02d3c-85b0-4995-96db-7007afce6139} {976cc6fe-97cf-4f47-98b8-45fad5b184a1}. I_8
+ right ReferenceExpression {d0bd732d-61e6-447e-be68-166236e1804f} {976cc6fe-97cf-4f47-98b8-45fad5b184a1}
+ memKind Integer {1c6a3700-6e7b-441d-902b-29255fde70b9} {d0bd732d-61e6-447e-be68-166236e1804f}. I_0
+ prefix ReferenceExpression {46fac801-bf63-4892-918e-a3bd4cb495ab} {d0bd732d-61e6-447e-be68-166236e1804f}
+ memKind Integer {90879bde-aa7c-493c-b9e9-a45261605466} {46fac801-bf63-4892-918e-a3bd4cb495ab}. I_0
+ ref OOReference {a67c8b14-2812-4d33-ba03-57eca78e73ae} {46fac801-bf63-4892-918e-a3bd4cb495ab}. S_{c01c5689-ef2a-463b-a3ef-dfee5c4a7217}:items
+ typeArguments TypedListOfExpression {f0a08005-7146-45a3-a8e8-c7383a3f5731} {46fac801-bf63-4892-918e-a3bd4cb495ab}
+ ref OOReference {4b83d68e-424f-47a4-b385-4de05959edd2} {d0bd732d-61e6-447e-be68-166236e1804f}. S_____NULL____:length
+ typeArguments TypedListOfExpression {03914261-b76b-41f0-bd2b-0ccbce9193f9} {d0bd732d-61e6-447e-be68-166236e1804f}
+ initStep VariableDeclarationExpression {7d1619da-acb8-4652-8fa7-ccdfe833e8ff} {4fdac042-1f62-4600-8995-61ae088d1359}
+ decl VariableDeclaration {ac8e4d53-fd9f-4e15-a823-901fbc203a7c} {7d1619da-acb8-4652-8fa7-ccdfe833e8ff}
+ annotations StatementItemList {cf9d5b2b-7ee8-4a02-b231-c1f446291be0} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}
+ initKind Integer {58fce195-28cc-4993-99f6-7c3805aafea0} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}. I_0
+ initialValue IntegerLiteral {0d2e501c-3cb4-4db6-ab2d-886530bcdb46} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}
+ value Text {f7a1fc26-24ca-4768-9346-1a1e97c032d5} {0d2e501c-3cb4-4db6-ab2d-886530bcdb46}. S_0
+ metaCalls TypedListOfExpression {779d8cec-cceb-43fb-8a1d-6aa44937fc1b} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}
+ modifiers Modifier {8075c58b-58c9-4701-87a9-4125271f978a} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}. I_0
+ name NameText {fc19fa7e-54e2-4a3e-86f2-ab45eed1140c} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}. S_i
+ subDeclarations TypedListOfDeclaration {3a475a1a-70ea-4a46-a8f0-b7eee1f88536} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}
+ typeExpression PrimitiveTypeExpression {bf18c255-43a8-4a91-81b1-92d6dc97064b} {ac8e4d53-fd9f-4e15-a823-901fbc203a7c}
+ val Integer {240fbe59-cf49-49be-9ffd-e8996475c395} {bf18c255-43a8-4a91-81b1-92d6dc97064b}. I_0
+ lpKind Integer {adc208a7-b9a4-4cb0-a162-58fd23606063} {4fdac042-1f62-4600-8995-61ae088d1359}. I_0
+ updateStep UnaryOperation {18922baf-ed54-44b5-a327-758317223d59} {4fdac042-1f62-4600-8995-61ae088d1359}
+ operand ReferenceExpression {6b823dd2-fc0a-4f7c-a306-4f824461ab7f} {18922baf-ed54-44b5-a327-758317223d59}
+ memKind Integer {fe1bf125-07af-45b1-b9ef-5f1ec30e737c} {6b823dd2-fc0a-4f7c-a306-4f824461ab7f}. I_0
+ ref OOReference {0cbf9fce-8856-40b4-9e1d-832eafdbeeff} {6b823dd2-fc0a-4f7c-a306-4f824461ab7f}. S_{7d1619da-acb8-4652-8fa7-ccdfe833e8ff}:i
+ typeArguments TypedListOfExpression {5b4bea15-1912-4165-9099-6129e339f5d9} {6b823dd2-fc0a-4f7c-a306-4f824461ab7f}
+ opr Integer {46ca6f62-4262-4cf8-936a-59c6d6c89a04} {18922baf-ed54-44b5-a327-758317223d59}. I_0
+ 5 ExpressionStatement {5d46c54e-f345-4aef-8ceb-5ab3b9f0e3be} {ee945e6e-2e69-4364-a939-6610948a79bb}
+ expression MethodCallExpression {ca2708e4-6e72-4688-a2f9-45f2b84016e3} {5d46c54e-f345-4aef-8ceb-5ab3b9f0e3be}
+ arguments TypedListOfExpression {c192488b-0e71-4145-ac55-e8cc9c43c02e} {ca2708e4-6e72-4688-a2f9-45f2b84016e3}
+ 0 BinaryOperation {02d4542d-2ee5-48fa-bc11-19297062d807} {c192488b-0e71-4145-ac55-e8cc9c43c02e}
+ left ReferenceExpression {bab2e6c2-8732-4c2f-b524-a8d157972256} {02d4542d-2ee5-48fa-bc11-19297062d807}
+ memKind Integer {df5054b3-edfc-42cb-ae53-aff65feb0067} {bab2e6c2-8732-4c2f-b524-a8d157972256}. I_0
+ prefix ReferenceExpression {48f77b27-a904-4d80-97ce-951b5b27d1c1} {bab2e6c2-8732-4c2f-b524-a8d157972256}
+ memKind Integer {8dfbbcac-84b8-4247-b4da-e3716358c910} {48f77b27-a904-4d80-97ce-951b5b27d1c1}. I_0
+ ref OOReference {daa91178-b6a1-49ef-8496-de84c8743314} {48f77b27-a904-4d80-97ce-951b5b27d1c1}. S_{c01c5689-ef2a-463b-a3ef-dfee5c4a7217}:items
+ typeArguments TypedListOfExpression {be6bf377-9dae-427d-b156-6cf3dfcfaeb3} {48f77b27-a904-4d80-97ce-951b5b27d1c1}
+ ref OOReference {3dd82586-3ced-4abb-99fc-a142e21820ee} {bab2e6c2-8732-4c2f-b524-a8d157972256}. S_____NULL____:length
+ typeArguments TypedListOfExpression {00fa83f8-a024-4772-a6d1-c98d15bc0595} {bab2e6c2-8732-4c2f-b524-a8d157972256}
+ opr Integer {298e138f-995d-4660-ba86-2d0d52c5c854} {02d4542d-2ee5-48fa-bc11-19297062d807}. I_4
+ right IntegerLiteral {2c95d759-513e-4162-8788-029c5d7761ab} {02d4542d-2ee5-48fa-bc11-19297062d807}
+ value Text {4f2447d7-503e-4d5f-b692-1efffcbafb79} {2c95d759-513e-4162-8788-029c5d7761ab}. S_1
+ cKind Integer {147bbf53-810e-4325-8308-fce4ab017efc} {ca2708e4-6e72-4688-a2f9-45f2b84016e3}. I_0
+ callee ReferenceExpression {6a96f4d7-3274-4952-a74f-4bdbe4abdb5d} {ca2708e4-6e72-4688-a2f9-45f2b84016e3}
+ memKind Integer {ac3f013e-55c1-4828-8efb-e40336a1c3de} {6a96f4d7-3274-4952-a74f-4bdbe4abdb5d}. I_0
+ ref OOReference {d31b27b1-53c0-4669-bf79-6158e00a0a73} {6a96f4d7-3274-4952-a74f-4bdbe4abdb5d}. S_{9d05e47c-8159-4dcf-b2ce-327e3e026b52}:resetItemCount
+ typeArguments TypedListOfExpression {0ba76959-b677-4b8b-b6e3-cc707823db64} {6a96f4d7-3274-4952-a74f-4bdbe4abdb5d}
+ 6 ExpressionStatement {c117e03f-fdcd-461e-995c-881b57c077a3} {ee945e6e-2e69-4364-a939-6610948a79bb}
  expression EmptyExpression {939d996d-b20c-4e2c-ae35-e0d23ab76745} {c117e03f-fdcd-461e-995c-881b57c077a3}
- 5 ExpressionStatement {34622545-ce68-4473-8f2a-665eac4b6650} {ee945e6e-2e69-4364-a939-6610948a79bb}
+ 7 ExpressionStatement {34622545-ce68-4473-8f2a-665eac4b6650} {ee945e6e-2e69-4364-a939-6610948a79bb}
  expression EmptyExpression {000f49dd-f404-42b8-828d-33ea434c5c44} {34622545-ce68-4473-8f2a-665eac4b6650}
- 6 ExpressionStatement {1ee7a331-570e-47f1-99fd-713c21b56601} {ee945e6e-2e69-4364-a939-6610948a79bb}
+ 8 ExpressionStatement {1ee7a331-570e-47f1-99fd-713c21b56601} {ee945e6e-2e69-4364-a939-6610948a79bb}
  expression EmptyExpression {02612241-ddb3-4c47-8b09-259b1b3f2c3f} {1ee7a331-570e-47f1-99fd-713c21b56601}
  memberInitializers TypedListOfMemberInitializer {f565da81-d673-4e54-928d-60639043a8ad} {a093f653-58a1-4175-badd-d72d9d47ad73}
  metaCalls TypedListOfExpression {20ad01d9-e0f4-486d-80f3-38371b75b80c} {a093f653-58a1-4175-badd-d72d9d47ad73}