Turn NAME into STRING and rename point as coordinate

These are more appropriate names for the types.

diff --git a/grammar b/grammar
index 8ea600ecd4551770d20cf1e13d4cfd9700ba7f8b..3125a71da1c7e433bfe06023b9e3410317bbf0c7 100644 (file)
--- a/grammar
+++ b/grammar
@@ -2,11 +2,11 @@ set_named_definition -> set_name EQUAL set
 set_definition -> points_domain VERTICAL_BAR constraint_list
 points_domain -> single_points_domain COMMA points_domain
 points_domain -> single_points_domain
-single_points_domain -> point COMMA single_points_domain
-single_points_domain -> point IN set
-point -> X
-point -> Y
-point -> Z
+single_points_domain -> coordinate COMMA single_points_domain
+single_points_domain -> coordinate IN set
+coordinate -> X
+coordinate -> Y
+coordinate -> Z
 constraint_list -> constraint
 constraint_list -> constraint logic_op constraint_list
 constraint -> LEFT_BRACKET constraint_list RIGHT_BRACKET
@@ -23,7 +23,7 @@ sum -> product
 product -> term TIMES product
 product -> term DIVIDE product
 product -> term
-term -> point
+term -> coordinate
 term -> parameter_name
 term -> number
 term -> function_call
@@ -36,7 +36,7 @@ parameters_domain -> parameter_name IN set COMMA parameters_domain
 parameters_domain -> parameter_name IN set
 parameter_equations -> parameter_equation COMMA parameter_equations
 parameter_equations -> parameter_equation
-parameter_equation -> point EQUAL expression
+parameter_equation -> coordinate EQUAL expression
 set -> set_name
 set -> LEFT_CURLY set_definition RIGHT_CURLY
 set -> LEFT_BRACKET set set_op set RIGHT_BRACKET
@@ -54,9 +54,10 @@ translate -> TRANSLATE LEFT_BRACKET vector RIGHT_BRACKET set
 mirror -> MIRROR LEFT_BRACKET vector RIGHT_BRACKET set
 axis -> vector
 vector -> LEFT_SQUARE number COMMA number COMMA number RIGHT_SQUARE
-parameter_name -> NAME
-function_name -> NAME
-set_name -> NAME
+parameter_name -> name
+function_name -> name
+set_name -> name
+name -> STRING
 number -> mantissa
 number -> mantissa exponent
 mantissa -> INT