feat: allow arbitrary expressions for scatter plot x and y values

mgreminger · Nov 7, 2023 · 9ed7dc7 · 9ed7dc7
1 parent 98b6b51
commit 9ed7dc7
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 182 deletions.
diff --git a/src/parser/LatexParser.g4 b/src/parser/LatexParser.g4
@@ -6,7 +6,7 @@ statement: (assign | assign_list | assign_plus_query | query | equality |
             u_block | number | id | id_list | guess | guess_list | expr |
             condition | piecewise_assign | insert_matrix | scatter_plot_query)? EOF;
 
-scatter_plot_query: (( L_PAREN id COMMA id R_PAREN ) | ( id COMMA id )) AS_LINES? EQ (( L_PAREN u_block COMMA u_block R_PAREN ) | ( u_block COMMA u_block ))?;
+scatter_plot_query: (( L_PAREN expr COMMA expr R_PAREN ) | ( expr COMMA expr )) AS_LINES? EQ (( L_PAREN u_block COMMA u_block R_PAREN ) | ( u_block COMMA u_block ))?;
 
 insert_matrix: .*? (u_insert_matrix .*?)+;