ecere/sys/ECON: Fixed ECON parsing bug with : inside string

diff --git a/doc/ecere/ecere/sys/_global-defs.econ b/doc/ecere/ecere/sys/_global-defs.econ
index 73a7038..8ab7f74 100644 (file)
--- a/doc/ecere/ecere/sys/_global-defs.econ
+++ b/doc/ecere/ecere/sys/_global-defs.econ
@@ -3,7 +3,7 @@
    description = "Platform independent System API (Files, Multithreading, Unicode, ...)",
    defines = [
       {
-         "Pi",
+         "ecere::sys::Pi",
          {
             description = "Ratio of a circle's circumference to its diameter; Measure of a half-circle angle in radians (180°)"
          }

diff --git a/ecere/src/sys/JSON.ec b/ecere/src/sys/JSON.ec
index f2d97b7..1801684 100644 (file)
--- a/ecere/src/sys/JSON.ec
+++ b/ecere/src/sys/JSON.ec
@@ -507,7 +507,7 @@ private:
                break;
             }
          }
-         else if(ch == '\"' || (!comment && ch && !isalpha(ch) && !isdigit(ch) && ch != '_'))
+         else if(ch == '\"' || (!quoted && !comment && ch && !isalpha(ch) && !isdigit(ch) && ch != '_'))
          {
             if(quoted && ch == '\"' && wasQuoted)
                *wasQuoted = true;