From c2805e03c84b6e598556fd06d1ede7aaeea7ce9c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 6 Mar 2012 16:17:54 -0800
Subject: Squashed commit FileIO-Build-Candidate into Master
Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
imports/codemirror/mode/pascal/LICENSE | 0
imports/codemirror/mode/pascal/index.html | 0
imports/codemirror/mode/pascal/pascal.js | 48 ++-----------------------------
3 files changed, 2 insertions(+), 46 deletions(-)
mode change 100755 => 100644 imports/codemirror/mode/pascal/LICENSE
mode change 100755 => 100644 imports/codemirror/mode/pascal/index.html
mode change 100755 => 100644 imports/codemirror/mode/pascal/pascal.js
(limited to 'imports/codemirror/mode/pascal')
diff --git a/imports/codemirror/mode/pascal/LICENSE b/imports/codemirror/mode/pascal/LICENSE
old mode 100755
new mode 100644
diff --git a/imports/codemirror/mode/pascal/index.html b/imports/codemirror/mode/pascal/index.html
old mode 100755
new mode 100644
diff --git a/imports/codemirror/mode/pascal/pascal.js b/imports/codemirror/mode/pascal/pascal.js
old mode 100755
new mode 100644
index 86c6f71c..9ac522f7
--- a/imports/codemirror/mode/pascal/pascal.js
+++ b/imports/codemirror/mode/pascal/pascal.js
@@ -7,11 +7,9 @@ CodeMirror.defineMode("pascal", function(config) {
var keywords = words("and array begin case const div do downto else end file for forward integer " +
"boolean char function goto if in label mod nil not of or packed procedure " +
"program record repeat set string then to type until var while with");
- var blockKeywords = words("case do else for if switch while struct then of");
var atoms = {"null": true};
var isOperatorChar = /[+\-*&%=<>!?|\/]/;
- var curPunc;
function tokenBase(stream, state) {
var ch = stream.next();
@@ -28,7 +26,6 @@ CodeMirror.defineMode("pascal", function(config) {
return tokenComment(stream, state);
}
if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
- curPunc = ch;
return null
}
if (/\d/.test(ch)) {
@@ -47,10 +44,7 @@ CodeMirror.defineMode("pascal", function(config) {
}
stream.eatWhile(/[\w\$_]/);
var cur = stream.current();
- if (keywords.propertyIsEnumerable(cur)) {
- if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
- return "keyword";
- }
+ if (keywords.propertyIsEnumerable(cur)) return "keyword";
if (atoms.propertyIsEnumerable(cur)) return "atom";
return "word";
}
@@ -79,55 +73,17 @@ CodeMirror.defineMode("pascal", function(config) {
return "comment";
}
- function Context(indented, column, type, align, prev) {
- this.indented = indented;
- this.column = column;
- this.type = type;
- this.align = align;
- this.prev = prev;
- }
- function pushContext(state, col, type) {
- return state.context = new Context(state.indented, col, type, null, state.context);
- }
- function popContext(state) {
- var t = state.context.type;
- if (t == ")" || t == "]" )
- state.indented = state.context.indented;
- return state.context = state.context.prev;
- }
-
// Interface
return {
startState: function(basecolumn) {
- return {
- tokenize: null,
- context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
- indented: 0,
- startOfLine: true
- };
+ return {tokenize: null};
},
token: function(stream, state) {
- var ctx = state.context;
- if (stream.sol()) {
- if (ctx.align == null) ctx.align = false;
- state.indented = stream.indentation();
- state.startOfLine = true;
- }
if (stream.eatSpace()) return null;
- curPunc = null;
var style = (state.tokenize || tokenBase)(stream, state);
if (style == "comment" || style == "meta") return style;
- if (ctx.align == null) ctx.align = true;
-
- if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
- else if (curPunc == "[") pushContext(state, stream.column(), "]");
- else if (curPunc == "(") pushContext(state, stream.column(), ")");
- else if (curPunc == ctx.type) popContext(state);
- else if ( ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
- pushContext(state, stream.column(), "statement");
- state.startOfLine = false;
return style;
},
--
cgit v1.2.3