Fix handling of quotes inside dollar expressions (issue #220).

Author: Kasper Peeters

core/CdbPython.cc

@@ -15,7 +15,8 @@
 #include "DataCell.hh"
 #endif
 
-// #define DEBUG
+// #define DEBUG __FILE__
+#include "Debug.hh"
 
 std::string cadabra::escape_quotes(const std::string& line)
 	{
@@ -467,11 +468,11 @@ std::string replace_dollar_expressions(const std::string& input,
 		char c = input[i];
 
 		// Toggle quote state
-		if (c == '"' && !in_single_quote) {
+		if (c == '"' && !in_single_quote && dollar_start == std::string::npos) {
 			in_double_quote = !in_double_quote;
 			result << c;
         }
-		else if (c == '\'' && !in_double_quote) {
+		else if (c == '\'' && !in_double_quote && dollar_start == std::string::npos) {
 			in_single_quote = !in_single_quote;
 			result << c;
 			}
@@ -594,6 +595,7 @@ std::pair<std::string, std::string> cadabra::convert_line(const std::string& lin
 		};
 
 	line_stripped = replace_dollar_expressions(line_stripped, replacement);
+	DEBUGLN( std::cerr << "line_stripped = " << line_stripped << std::endl; );
 
 // 	std::regex dollarmatch(R"(\$([^\$]*)\$)");
 // 	line_stripped = std::regex_replace(line_stripped, dollarmatch, "Ex(r'''$1''', False)", std::regex_constants::match_default | std::regex_constants::format_default );

core/properties/Indices.cc

@@ -180,7 +180,7 @@ const std::vector<Ex>& Indices::values(const Properties& properties, Ex::iterato
 //		throw ArgumentException("No explicit values set for indices, and no Integer property found.");
 
 	if(!iv->from.is_integer() || !iv->to.is_integer()) 
-		throw ArgumentException("Indicex has integer property, but explicit range needed.");
+		throw ArgumentException("Indices have integer property, but explicit range needed.");
 
 	for(int val = iv->from.to_integer(); val <= iv->to.to_integer(); ++val)
 		values_.push_back(Ex(val));

examples/sample_dyn.cnb

@@ -662,3 +662,15 @@ def test132():
     print("Test 132 passed")
 
 test132()
+
+def test133():
+    __cdbkernel__=create_scope()
+    ex:= A + B3 + C7.
+    substitute(_, $A + M? + N? | \regex{M?}{"[A-Z]7"} -> \sin(M? N?)/N?$)
+    tst:= \sin(C7 B3)/B3 - @(ex);
+    assert(tst==0)
+    print("Test 133 passed")
+
+test133()
+
+    

tests/substitute.cdb

@@ -39,6 +39,9 @@ <h3>github devel branch (2.5.13)</h3>
   <li>AppImages are back, on both x86_64 and arm64.</li>
   <li>Fix loading <tt>cadabra2_defaults.py</tt> in the Jupyter kernel.</li>
   <li>Fix scrolling bug in notebook which would make the document jump around for no good reason.</li>
+  <li>Fix homebrew package (by avoiding svg icons on macOS, as homebrew does not package librsvg correctly).</li>
+  <li>Internal: refactor to enable cleaner insertion of related properties on property declaration.</li>
+  <li>Fix handling substitute with regex (<a href="https://github.com/kpeeters/cadabra2/issues/220">#220</a>, David).</li>
 </ul>
 
 <a name="2.5.12"></a>