From a067b8252a3d180961284dff37e8e193c16c8c71 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Wed, 3 Aug 2016 07:20:32 -0400 Subject: [PATCH] ecere/sys/ECON: Fixed ECON parsing bug with : inside string --- doc/ecere/ecere/sys/_global-defs.econ | 2 +- ecere/src/sys/JSON.ec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ecere/ecere/sys/_global-defs.econ b/doc/ecere/ecere/sys/_global-defs.econ index 73a7038..8ab7f74 100644 --- 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 --- 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; -- 1.8.3.1