aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Trevor Elliott <trevor@galois.com>2013-06-26 11:48:12 -0700
committerGravatar Trevor Elliott <trevor@galois.com>2013-06-26 11:48:12 -0700
commitb8ed4b775feff99a5be73632367b666d8a833fa3 (patch)
tree35bd0739a62e47dbd2faa5a347d2d74a9bdb4d11
parent9c27c7e281a54e8819d256b7ac054f77cf957631 (diff)
Fix comment removal in double quotes
-rw-r--r--src/js/fiveui/js/utils.js20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/js/fiveui/js/utils.js b/src/js/fiveui/js/utils.js
index 204d961..9f4d2c6 100644
--- a/src/js/fiveui/js/utils.js
+++ b/src/js/fiveui/js/utils.js
@@ -98,6 +98,8 @@ var removeComments = function(data) {
var state = 0;
var toEOL = 1;
var toEOC = 2;
+ var inQUOTE = 3;
+ var inDQUOTE = 4;
var sanitized = '';
var len = data.length;
@@ -120,8 +122,24 @@ var removeComments = function(data) {
}
break;
+ case inQUOTE:
+ if(data[e] == '\'') {
+ state = 0;
+ }
+ break;
+
+ case inDQUOTE:
+ if(data[e] == '"') {
+ state = 0;
+ }
+ break;
+
default:
- if(data[e] == '/') {
+ if(data[e] == '\'') {
+ state = inQUOTE;
+ } else if(data[e] == '"') {
+ state = inDQUOTE;
+ } else if(data[e] == '/') {
if(data[e+1] == '/') {
sanitized = sanitized + data.substring(s,e);
state = toEOL;