mds-kbdc: m + add argument count suffix to macro calls during simplification

Signed-off-by: Mattias Andrée <maandree@operamail.com>

8 files changed, 44 insertions, 26 deletions

diff --git a/test-files/mds-kbdc/simplify-tree/valid/alternated_value_statement b/test-files/mds-kbdc/simplify-tree/valid/alternated_value_statement
new file mode 100644
index 0000000..fae3bc1
--- /dev/null
+++ b/test-files/mds-kbdc/simplify-tree/valid/alternated_value_statement
@@ -0,0 +1,18 @@
+[1 2]
+
+# (map (@ 1 0-0)
+#   (.sequence
+#     (string (@ 1 1-2) ‘1’)
+#   )
+#   (.result nil)
+# )
+# (map (@ 1 0-0)
+#   (.sequence
+#     (string (@ 1 3-4) ‘2’)
+#   )
+#   (.result nil)
+# )
+# :1:0–1: warning: alternated value statement is undefined unless the alternatives are identical
+#  [1 2]
+#  ^
+
diff --git a/test-files/mds-kbdc/simplify-tree/valid/macro_call b/test-files/mds-kbdc/simplify-tree/valid/macro_call
index 9341a8b..24502cb 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/macro_call
+++ b/test-files/mds-kbdc/simplify-tree/valid/macro_call
@@ -1,10 +1,10 @@
 my_macro()
 my_macro(1)
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/0’
 #   (.arguments nil)
 # )
-# (macro_call (@ 2 0-8) ‘my_macro’
+# (macro_call (@ 2 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 2 9-10) ‘1’)
 #   )
diff --git a/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation b/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation
index 0122c06..a2c306d 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation
+++ b/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation
@@ -1,55 +1,55 @@
 my_macro([1 2] [3 4] [5 6])
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #     (string (@ 1 16-17) ‘3’)
 #     (string (@ 1 22-23) ‘5’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #     (string (@ 1 16-17) ‘3’)
 #     (string (@ 1 24-25) ‘6’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #     (string (@ 1 18-19) ‘4’)
 #     (string (@ 1 22-23) ‘5’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #     (string (@ 1 18-19) ‘4’)
 #     (string (@ 1 24-25) ‘6’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 12-13) ‘2’)
 #     (string (@ 1 16-17) ‘3’)
 #     (string (@ 1 22-23) ‘5’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 12-13) ‘2’)
 #     (string (@ 1 16-17) ‘3’)
 #     (string (@ 1 24-25) ‘6’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 12-13) ‘2’)
 #     (string (@ 1 18-19) ‘4’)
 #     (string (@ 1 22-23) ‘5’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/3’
 #   (.arguments
 #     (string (@ 1 12-13) ‘2’)
 #     (string (@ 1 18-19) ‘4’)
diff --git a/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation_with_nothing b/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation_with_nothing
index 0c7096e..14e2ea2 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation_with_nothing
+++ b/test-files/mds-kbdc/simplify-tree/valid/macro_call_alternation_with_nothing
@@ -1,23 +1,23 @@
 my_macro([1 2] [3 .])
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/2’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #     (string (@ 1 16-17) ‘3’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/2’
 #   (.arguments
 #     (string (@ 1 12-13) ‘2’)
 #     (string (@ 1 16-17) ‘3’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 12-13) ‘2’)
 #   )
diff --git a/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_nothing b/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_nothing
index f067b27..f386cbe 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_nothing
+++ b/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_nothing
@@ -1,10 +1,10 @@
 my_macro(.)
 my_macro(. .)
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/0’
 #   (.arguments nil)
 # )
-# (macro_call (@ 2 0-8) ‘my_macro’
+# (macro_call (@ 2 0-8) ‘my_macro/0’
 #   (.arguments nil)
 # )
 # :1:9–10: warning: ‘.’ outside alternation has no effect
diff --git a/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_singleton_alternation b/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_singleton_alternation
index c005dea..a6388cc 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_singleton_alternation
+++ b/test-files/mds-kbdc/simplify-tree/valid/macro_call_with_singleton_alternation
@@ -1,6 +1,6 @@
 my_macro([1])
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #   )
diff --git a/test-files/mds-kbdc/simplify-tree/valid/multiple_nothing_alternation_in_macro_call b/test-files/mds-kbdc/simplify-tree/valid/multiple_nothing_alternation_in_macro_call
index ef35cea..43ad4a1 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/multiple_nothing_alternation_in_macro_call
+++ b/test-files/mds-kbdc/simplify-tree/valid/multiple_nothing_alternation_in_macro_call
@@ -1,20 +1,20 @@
 my_macro([1 . . . 2])
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 10-11) ‘1’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/0’
 #   (.arguments nil)
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/0’
 #   (.arguments nil)
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/0’
 #   (.arguments nil)
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 18-19) ‘2’)
 #   )
diff --git a/test-files/mds-kbdc/simplify-tree/valid/nested_alternations_in_macro_call b/test-files/mds-kbdc/simplify-tree/valid/nested_alternations_in_macro_call
index d40a68d..9289a4f 100644
--- a/test-files/mds-kbdc/simplify-tree/valid/nested_alternations_in_macro_call
+++ b/test-files/mds-kbdc/simplify-tree/valid/nested_alternations_in_macro_call
@@ -1,21 +1,21 @@
 my_macro([[1 2] [3 4]])
 
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 11-12) ‘1’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 13-14) ‘2’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 17-18) ‘3’)
 #   )
 # )
-# (macro_call (@ 1 0-8) ‘my_macro’
+# (macro_call (@ 1 0-8) ‘my_macro/1’
 #   (.arguments
 #     (string (@ 1 19-20) ‘4’)
 #   )