From 3dc9563e3652198db4b5a0c793c3767fdcade446 Mon Sep 17 00:00:00 2001
From: Vadim Kiryukhin <vkiryukhin@gmail.com>
Date: Wed, 29 Feb 2012 08:01:58 -0800
Subject: [PATCH] replace token ~#~ with ~::~

---
 main.js       |  2 +-
 vkbeautify.js | 96 +++++++++++++++++++++++++--------------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/main.js b/main.js
index 20d7250..4fab4cd 100644
--- a/main.js
+++ b/main.js
@@ -154,7 +154,7 @@ function loadTemplate(name)
 		case 'basicsql':
 			$('#ta').width(600);
 			$('#leftpanel').show();
-			document.getElementById('ta').value = "SELECT ca.proj_id AS proj_id, ca.ca_name AS proj_name, ca.ca_date_start AS proj_start, ca.ca_date_end AS proj_end,(SELECT COUNT(*) FROM rotations r WHERE r.proj_id = proj_id AND r.r_status = 'R' GROUP BY r.proj_id) r_count, (SELECT count(*) FROM rotations r WHERE r.proj_id = proj_id AND r.channel_id = 24 ) r_rtb_count, ca.ca_service_type FROM projs ca, clients c, proj_auth caa WHERE ca.client_id = 12345 AND ca.client_id = c.client_id AND ca_type = 'zzz' AND c.agency_id = 0 AND ca.client_id = NVL( caa.client_id, ca.client_id ) AND proj_id = NVL( caa.proj_id, proj_id ) AND caa.contact_id = 7890";
+			document.getElementById('ta').value = "SELECT ca.proj_id AS proj_id, ca.ca_name AS proj_name, ca.ca_date_start AS proj_start, ca.ca_date_end AS proj_end,(SELECT COUNT(*) FROM rotations r WHERE r.proj_id = proj_id AND r.r_status = 'R' GROUP BY r.proj_id) r_count, (SELECT count(*) FROM rotations r WHERE r.proj_id = proj_id AND r.channel_id = 24 ) r_rtb_count FROM projs ca, clients c, proj_auth caa WHERE ca.client_id = 12345 AND ca.client_id = c.client_id AND ca_type = 'zzz' AND c.agency_id = 0 AND ca.client_id = NVL( caa.client_id, ca.client_id ) AND proj_id = NVL( caa.proj_id, proj_id ) AND caa.contact_id = 7890";
 			$('#rightpanel').empty().load('html/basicsql.html');
 			$('#rightpanel').empty();
 			$('#mode').html('SQL');
diff --git a/vkbeautify.js b/vkbeautify.js
index 8da45a9..7910727 100644
--- a/vkbeautify.js
+++ b/vkbeautify.js
@@ -49,7 +49,7 @@ function vkbeautify(){
 
 vkbeautify.prototype.xml = function(text) {
 
-	var ar = text.replace(/>\s{0,}</g,"><").replace(/</g,"~#~<").split('~#~'),
+	var ar = text.replace(/>\s{0,}</g,"><").replace(/</g,"~::~<").split('~::~'),
 		len = ar.length,
 		inComment = false,
 		deep = 0,
@@ -117,14 +117,14 @@ vkbeautify.prototype.json = function(text) {
 				.replace(/:\s{0,}\"/g,':"')
 				.replace(/:\s{0,}\[/g,':[')
 				
-				.replace(/\{/g,"~#~{~#~")
-				.replace(/\[/g,"[~#~")
-				.replace(/\}/g,"~#~}")
-				.replace(/\]/g,"~#~]")
-				.replace(/\"\,/g,'",~#~')
-				.replace(/\,\"/g,',~#~"')
-				.replace(/~#~\s{0,}~#~/g,"~#~")
-				.split('~#~'),
+				.replace(/\{/g,"~::~{~::~")
+				.replace(/\[/g,"[~::~")
+				.replace(/\}/g,"~::~}")
+				.replace(/\]/g,"~::~]")
+				.replace(/\"\,/g,'",~::~')
+				.replace(/\,\"/g,',~::~"')
+				.replace(/~::~\s{0,}~::~/g,"~::~")
+				.split('~::~'),
 				
 		len = ar.length,
 		deep = 0,
@@ -153,13 +153,13 @@ vkbeautify.prototype.json = function(text) {
 vkbeautify.prototype.css = function(text) {
 
 	var ar = text.replace(/\s{1,}/g,' ')
-				.replace(/\{/g,"{~#~")
-				.replace(/\}/g,"~#~}~#~")
-				.replace(/\;/g,";~#~")
-				.replace(/\/\*/g,"~#~/*")
-				.replace(/\*\//g,"*/~#~")
-				.replace(/~#~\s{0,}~#~/g,"~#~")
-				.split('~#~'),
+				.replace(/\{/g,"{~::~")
+				.replace(/\}/g,"~::~}~::~")
+				.replace(/\;/g,";~::~")
+				.replace(/\/\*/g,"~::~/*")
+				.replace(/\*\//g,"*/~::~")
+				.replace(/~::~\s{0,}~::~/g,"~::~")
+				.split('~::~'),
 		len = ar.length,
 		deep = 0,
 		str = '',
@@ -193,40 +193,40 @@ function split_sql(str, tab) {
 
 	return str.replace(/\s{1,}/g," ")
 
-				.replace(/ AND /ig,"~#~"+tab+tab+"AND ")
-				.replace(/ BETWEEN /ig,"~#~"+tab+"BETWEEN ")
-				.replace(/ CASE /ig,"~#~"+tab+"CASE ")
-				.replace(/ ELSE /ig,"~#~"+tab+"ELSE ")
-				.replace(/ END /ig,"~#~"+tab+"END ")
-				.replace(/ FROM /ig,"~#~FROM ")
-				.replace(/ GROUP\s{1,}BY/ig,"~#~GROUP BY ")
-				.replace(/ HAVING /ig,"~#~HAVING ")
-				//.replace(/ IN /ig,"~#~"+tab+"IN ")
+				.replace(/ AND /ig,"~::~"+tab+tab+"AND ")
+				.replace(/ BETWEEN /ig,"~::~"+tab+"BETWEEN ")
+				.replace(/ CASE /ig,"~::~"+tab+"CASE ")
+				.replace(/ ELSE /ig,"~::~"+tab+"ELSE ")
+				.replace(/ END /ig,"~::~"+tab+"END ")
+				.replace(/ FROM /ig,"~::~FROM ")
+				.replace(/ GROUP\s{1,}BY/ig,"~::~GROUP BY ")
+				.replace(/ HAVING /ig,"~::~HAVING ")
+				//.replace(/ IN /ig,"~::~"+tab+"IN ")
 				.replace(/ IN /ig," IN ")
 				
-				.replace(/ JOIN /ig,"~#~JOIN ")
-				.replace(/ CROSS~#~{1,}JOIN /ig,"~#~CROSS JOIN ")
-				.replace(/ INNER~#~{1,}JOIN /ig,"~#~INNER JOIN ")
-				.replace(/ LEFT~#~{1,}JOIN /ig,"~#~LEFT JOIN ")
-				.replace(/ RIGHT~#~{1,}JOIN /ig,"~#~RIGHT JOIN ")
+				.replace(/ JOIN /ig,"~::~JOIN ")
+				.replace(/ CROSS~::~{1,}JOIN /ig,"~::~CROSS JOIN ")
+				.replace(/ INNER~::~{1,}JOIN /ig,"~::~INNER JOIN ")
+				.replace(/ LEFT~::~{1,}JOIN /ig,"~::~LEFT JOIN ")
+				.replace(/ RIGHT~::~{1,}JOIN /ig,"~::~RIGHT JOIN ")
 				
-				.replace(/ ON /ig,"~#~"+tab+"ON ")
-				.replace(/ OR /ig,"~#~"+tab+tab+"OR ")
-				.replace(/ ORDER\s{1,}BY/ig,"~#~ORDER BY ")
-				.replace(/ OVER /ig,"~#~"+tab+"OVER ")
+				.replace(/ ON /ig,"~::~"+tab+"ON ")
+				.replace(/ OR /ig,"~::~"+tab+tab+"OR ")
+				.replace(/ ORDER\s{1,}BY/ig,"~::~ORDER BY ")
+				.replace(/ OVER /ig,"~::~"+tab+"OVER ")
 
-				.replace(/\(\s{0,}SELECT /ig,"~#~(SELECT ")
-				.replace(/\)\s{0,}SELECT /ig,")~#~SELECT ")
+				.replace(/\(\s{0,}SELECT /ig,"~::~(SELECT ")
+				.replace(/\)\s{0,}SELECT /ig,")~::~SELECT ")
 				
-				.replace(/ THEN /ig," THEN~#~"+tab+"")
-				.replace(/ UNION /ig,"~#~UNION~#~")
-				.replace(/ USING /ig,"~#~USING ")
-				.replace(/ WHEN /ig,"~#~"+tab+"WHEN ")
-				.replace(/ WHERE /ig,"~#~WHERE ")
-				.replace(/ WITH /ig,"~#~WITH ")
+				.replace(/ THEN /ig," THEN~::~"+tab+"")
+				.replace(/ UNION /ig,"~::~UNION~::~")
+				.replace(/ USING /ig,"~::~USING ")
+				.replace(/ WHEN /ig,"~::~"+tab+"WHEN ")
+				.replace(/ WHERE /ig,"~::~WHERE ")
+				.replace(/ WITH /ig,"~::~WITH ")
 				
-				//.replace(/\,\s{0,}\(/ig,",~#~( ")
-				//.replace(/\,/ig,",~#~"+tab+tab+"")
+				//.replace(/\,\s{0,}\(/ig,",~::~( ")
+				//.replace(/\,/ig,",~::~"+tab+tab+"")
 
 				.replace(/ ALL /ig," ALL ")
 				.replace(/ AS /ig," AS ")
@@ -239,15 +239,15 @@ function split_sql(str, tab) {
 				.replace(/ LIKE /ig," LIKE ")
 				.replace(/\s{0,}SELECT /ig,"SELECT ")
 							
-				.replace(/~#~{1,}/g,"~#~")
-				.split('~#~');
+				.replace(/~::~{1,}/g,"~::~")
+				.split('~::~');
 }
 
 vkbeautify.prototype.sql = function(text, brakeOnComma) {
 
 	var ar_by_quote = text.replace(/\s{1,}/g," ")
-							.replace(/\'/ig,"~#~\'")
-							.split('~#~'),
+							.replace(/\'/ig,"~::~\'")
+							.split('~::~'),
 		len = ar_by_quote.length,
 		ar = [],
 		deep = 0,