diff options
40 files changed, 1201 insertions, 818 deletions
diff --git a/credits.html b/credits.html index 1cc36c78..082eefd4 100644 --- a/credits.html +++ b/credits.html | |||
@@ -95,5 +95,14 @@ | |||
95 | <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li> | 95 | <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li> |
96 | </ul> | 96 | </ul> |
97 | </div> | 97 | </div> |
98 | |||
99 | <div> | ||
100 | js-beautify | ||
101 | <ul> | ||
102 | <li>Written by Einar Lielmanis, <a href="mailto:einar@jsbeautifier.org">einar@jsbeautifier.org</a>. Python version flourished by <a href="http://github.com/satufk">Stefano Sanfilippo</a> with help from <a href="http://jason.diamond.name/weblog/">Jason Diamond</a>, Patrick Hof, Nochum Sossonko, Andreas Schneider, Dave Vasilevsky, <a href="http://my.opera.com/Vital/blog/">Vital Batmanov,</a> Ron Baldwin, Gabriel Harrison, <a href="http://shullian.com">Chris J. Shull</a>, <a href="http://mathiasbynens.be/">Mathias Bynens</a> and others.</li> | ||
103 | <li>Code from: <a href="https://github.com/einars/js-beautify" target="_blank">https://github.com/einars/js-beautify</a></li> | ||
104 | <li>License: <a href="https://github.com/einars/js-beautify/blob/master/license.txt" target="_blank">https://github.com/einars/js-beautify/blob/master/license.txt</a></li> | ||
105 | </ul> | ||
106 | </div> | ||
98 | </body> | 107 | </body> |
99 | </html> \ No newline at end of file | 108 | </html> \ No newline at end of file |
diff --git a/imports/codemirror/mode/scheme/scheme.js b/imports/codemirror/mode/scheme/scheme.js index caf78db0..45ae1822 100755..100644 --- a/imports/codemirror/mode/scheme/scheme.js +++ b/imports/codemirror/mode/scheme/scheme.js | |||
@@ -1,202 +1,202 @@ | |||
1 | /** | 1 | /** |
2 | * Author: Koh Zi Han, based on implementation by Koh Zi Chun | 2 | * Author: Koh Zi Han, based on implementation by Koh Zi Chun |
3 | */ | 3 | */ |
4 | CodeMirror.defineMode("scheme", function (config, mode) { | 4 | CodeMirror.defineMode("scheme", function (config, mode) { |
5 | var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", | 5 | var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", |
6 | ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword"; | 6 | ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword"; |
7 | var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1; | 7 | var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1; |
8 | 8 | ||
9 | function makeKeywords(str) { | 9 | function makeKeywords(str) { |
10 | var obj = {}, words = str.split(" "); | 10 | var obj = {}, words = str.split(" "); |
11 | for (var i = 0; i < words.length; ++i) obj[words[i]] = true; | 11 | for (var i = 0; i < words.length; ++i) obj[words[i]] = true; |
12 | return obj; | 12 | return obj; |
13 | } | 13 | } |
14 | 14 | ||
15 | var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"); | 15 | var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"); |
16 | var indentKeys = makeKeywords("define let letrec let* lambda"); | 16 | var indentKeys = makeKeywords("define let letrec let* lambda"); |
17 | 17 | ||
18 | 18 | ||
19 | function stateStack(indent, type, prev) { // represents a state stack object | 19 | function stateStack(indent, type, prev) { // represents a state stack object |
20 | this.indent = indent; | 20 | this.indent = indent; |
21 | this.type = type; | 21 | this.type = type; |
22 | this.prev = prev; | 22 | this.prev = prev; |
23 | } | 23 | } |
24 | 24 | ||
25 | function pushStack(state, indent, type) { | 25 | function pushStack(state, indent, type) { |
26 | state.indentStack = new stateStack(indent, type, state.indentStack); | 26 | state.indentStack = new stateStack(indent, type, state.indentStack); |
27 | } | 27 | } |
28 | 28 | ||
29 | function popStack(state) { | 29 | function popStack(state) { |
30 | state.indentStack = state.indentStack.prev; | 30 | state.indentStack = state.indentStack.prev; |
31 | } | 31 | } |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * Scheme numbers are complicated unfortunately. | 34 | * Scheme numbers are complicated unfortunately. |
35 | * Checks if we're looking at a number, which might be possibly a fraction. | 35 | * Checks if we're looking at a number, which might be possibly a fraction. |
36 | * Also checks that it is not part of a longer identifier. Returns true/false accordingly. | 36 | * Also checks that it is not part of a longer identifier. Returns true/false accordingly. |
37 | */ | 37 | */ |
38 | function isNumber(ch, stream){ | 38 | function isNumber(ch, stream){ |
39 | if(/[0-9]/.exec(ch) != null){ | 39 | if(/[0-9]/.exec(ch) != null){ |
40 | stream.eatWhile(/[0-9]/); | 40 | stream.eatWhile(/[0-9]/); |
41 | stream.eat(/\//); | 41 | stream.eat(/\//); |
42 | stream.eatWhile(/[0-9]/); | 42 | stream.eatWhile(/[0-9]/); |
43 | if (stream.eol() || !(/[a-zA-Z\-\_\/]/.exec(stream.peek()))) return true; | 43 | if (stream.eol() || !(/[a-zA-Z\-\_\/]/.exec(stream.peek()))) return true; |
44 | stream.backUp(stream.current().length - 1); // undo all the eating | 44 | stream.backUp(stream.current().length - 1); // undo all the eating |
45 | } | 45 | } |
46 | return false; | 46 | return false; |
47 | } | 47 | } |
48 | 48 | ||
49 | return { | 49 | return { |
50 | startState: function () { | 50 | startState: function () { |
51 | return { | 51 | return { |
52 | indentStack: null, | 52 | indentStack: null, |
53 | indentation: 0, | 53 | indentation: 0, |
54 | mode: false, | 54 | mode: false, |
55 | sExprComment: false | 55 | sExprComment: false |
56 | }; | 56 | }; |
57 | }, | 57 | }, |
58 | 58 | ||
59 | token: function (stream, state) { | 59 | token: function (stream, state) { |
60 | if (state.indentStack == null && stream.sol()) { | 60 | if (state.indentStack == null && stream.sol()) { |
61 | // update indentation, but only if indentStack is empty | 61 | // update indentation, but only if indentStack is empty |
62 | state.indentation = stream.indentation(); | 62 | state.indentation = stream.indentation(); |
63 | } | 63 | } |
64 | 64 | ||
65 | // skip spaces | 65 | // skip spaces |
66 | if (stream.eatSpace()) { | 66 | if (stream.eatSpace()) { |
67 | return null; | 67 | return null; |
68 | } | 68 | } |
69 | var returnType = null; | 69 | var returnType = null; |
70 | 70 | ||
71 | switch(state.mode){ | 71 | switch(state.mode){ |
72 | case "string": // multi-line string parsing mode | 72 | case "string": // multi-line string parsing mode |
73 | var next, escaped = false; | 73 | var next, escaped = false; |
74 | while ((next = stream.next()) != null) { | 74 | while ((next = stream.next()) != null) { |
75 | if (next == "\"" && !escaped) { | 75 | if (next == "\"" && !escaped) { |
76 | 76 | ||
77 | state.mode = false; | 77 |