From ab1ed57d55fc3546e299621963968e06d7979fab Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 6 Apr 2013 13:13:54 +0400 Subject: [PATCH] remove half working fortran and html_twig --- demo/kitchen-sink/doclist.js | 1 - demo/kitchen-sink/docs/fortran.f95 | 28 - demo/kitchen-sink/modelist.js | 5 +- lib/ace/mode/fortran_modern.js | 64 -- .../mode/fortran_modern_highlight_rules.js | 187 ----- lib/ace/mode/html_twig.js | 64 -- lib/ace/mode/html_twig_highlight_rules.js | 683 ------------------ 7 files changed, 1 insertion(+), 1031 deletions(-) delete mode 100644 demo/kitchen-sink/docs/fortran.f95 delete mode 100644 lib/ace/mode/fortran_modern.js delete mode 100644 lib/ace/mode/fortran_modern_highlight_rules.js delete mode 100644 lib/ace/mode/html_twig.js delete mode 100644 lib/ace/mode/html_twig_highlight_rules.js diff --git a/demo/kitchen-sink/doclist.js b/demo/kitchen-sink/doclist.js index 81fc5081..f0300f1f 100644 --- a/demo/kitchen-sink/doclist.js +++ b/demo/kitchen-sink/doclist.js @@ -140,7 +140,6 @@ var docs = { "docs/actionscript.as": "ActionScript", "docs/erlang/erl": "Erlang", "docs/forth.frt": "Forth", - "docs/fortran.f95": "Fortran", "docs/haskell.hs": "Haskell", "docs/julia.js": "Julia", "docs/prolog/plg": "Prolog", diff --git a/demo/kitchen-sink/docs/fortran.f95 b/demo/kitchen-sink/docs/fortran.f95 deleted file mode 100644 index 8dbd8809..00000000 --- a/demo/kitchen-sink/docs/fortran.f95 +++ /dev/null @@ -1,28 +0,0 @@ -! sum.f90 -! Performs summations using in a loop using EXIT statement -! Saves input information and the summation in a data file - -program summation -implicit none -integer :: sum, a - -print*, "This program performs summations. Enter 0 to stop." -open(unit=10, file="SumData.DAT") - -sum = 0 - -do - print*, "Add:" - read*, a - if (a == 0) then - exit - else - sum = sum + a - end if - write(10,*) a -end do - -print*, "Summation =", sum -write(10,*) "Summation =", sum -close(10) - \ No newline at end of file diff --git a/demo/kitchen-sink/modelist.js b/demo/kitchen-sink/modelist.js index 9ba4a13d..7001001b 100644 --- a/demo/kitchen-sink/modelist.js +++ b/demo/kitchen-sink/modelist.js @@ -110,13 +110,10 @@ var modesByName = { actionscript: ["ActionScript" ,"as"], erlang: ["Erlang" ,"erl|hrl"], forth: ["Forth", ,"frt|fs|ldr"], - fortran_modern: ["Fortran - Modern", ,"f90|F90|f95|F95|f03|F03|f08|F08"], haskell: ["Haskell", "hs"], julia: ["Julia", "jl"], prolog: ["Prolog", "plg|prolog"], - rust: ["Rust", "rs|rc"] - - + rust: ["Rust", "rs"] }; for (var name in modesByName) { diff --git a/lib/ace/mode/fortran_modern.js b/lib/ace/mode/fortran_modern.js deleted file mode 100644 index 5e12e38d..00000000 --- a/lib/ace/mode/fortran_modern.js +++ /dev/null @@ -1,64 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Distributed under the BSD license: - * - * Copyright (c) 2012, Ajax.org B.V. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Ajax.org B.V. nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - * Contributor(s): - * - * - * - * ***** END LICENSE BLOCK ***** */ - -/* - THIS FILE WAS AUTOGENERATED BY mode.tmpl.js -*/ - -define(function(require, exports, module) { -"use strict"; - -var oop = require("../lib/oop"); -var TextMode = require("./text").Mode; -var Tokenizer = require("../tokenizer").Tokenizer; -var FortranModernHighlightRules = require("./fortran_modern_highlight_rules").FortranModernHighlightRules; -// TODO: pick appropriate fold mode -var FoldMode = require("./folding/cstyle").FoldMode; - -var Mode = function() { - var highlighter = new FortranModernHighlightRules(); - this.foldingRules = new FoldMode(); - this.$tokenizer = new Tokenizer(highlighter.getRules()); -}; -oop.inherits(Mode, TextMode); - -(function() { - this.lineCommentStart = "!"; - this.blockComment = {start: "/*", end: "*/"}; - // Extra logic goes here. -}).call(Mode.prototype); - -exports.Mode = Mode; -}); \ No newline at end of file diff --git a/lib/ace/mode/fortran_modern_highlight_rules.js b/lib/ace/mode/fortran_modern_highlight_rules.js deleted file mode 100644 index b213e1d0..00000000 --- a/lib/ace/mode/fortran_modern_highlight_rules.js +++ /dev/null @@ -1,187 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Distributed under the BSD license: - * - * Copyright (c) 2012, Ajax.org B.V. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Ajax.org B.V. nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * ***** END LICENSE BLOCK ***** */ - -/* This file was autogenerated from tm bundles\fortran.tmbundle\Syntaxes\Fortran - Modern.tmLanguage (uuid: ) */ -/**************************************************************************************** - * IT MIGHT NOT BE PERFECT ...But it's a good start from an existing *.tmlanguage file. * - * fileTypes * - ****************************************************************************************/ - -define(function(require, exports, module) { -"use strict"; - -var oop = require("../lib/oop"); -var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; - -var FortranModernHighlightRules = function() { - // regexp must not have capturing parentheses. Use (?:) instead. - // regexps are ordered -> the first match is used - - this.$rules = { start: - [ { include: 'source.fortran' }, - { todo: - { token: - [ 'meta.function.interface.operator.fortran.modern', - 'storage.type.function.fortran', - 'meta.function.interface.operator.fortran.modern', - 'storage.type.fortran', - 'meta.function.interface.operator.fortran.modern', - 'keyword.operator.fortran', - 'meta.function.interface.operator.fortran.modern' ], - regex: '^(\\s*)(interface)(\\s+)(operator|assignment)(\\()(\\.[a-zA-Z0-9_]+\\.|[\\+\\-\\=\\/\\*]+)(\\))', - caseInsensitive: true, - push: - [ { token: - [ 'keyword.other.fortran', - 'meta.function.interface.operator.fortran.modern', - 'storage.type.function.fortran' ], - regex: '(end)(\\s*)((?:interface)?)', - caseInsensitive: true, - next: 'pop' }, - { include: '$self' }, - { defaultToken: 'meta.function.interface.operator.fortran.modern' } ] }, - comment: 'Interface declaration of operator/assignments' }, - { todo: - { token: - [ 'meta.function.interface.fortran.modern', - 'storage.type.function.fortran', - 'meta.function.interface.fortran.modern', - 'entity.name.function.fortran' ], - regex: '^(\\s*)(interface)(\\s+)([A-Za-z_][A-Za-z0-9_]*)', - caseInsensitive: true, - push: - [ { token: - [ 'keyword.other.fortran', - 'meta.function.interface.fortran.modern', - 'storage.type.function.fortran' ], - regex: '(end)(\\s*)((?:interface)?)', - caseInsensitive: true, - next: 'pop' }, - { include: '$self' }, - { defaultToken: 'meta.function.interface.fortran.modern' } ] }, - comment: 'Interface declaration of function/subroutines' }, - { todo: - { token: - [ 'meta.type-definition.fortran.modern', - 'storage.type.fortran.modern', - 'meta.type-definition.fortran.modern', - 'entity.name.type.fortran.modern' ], - regex: '^(\\s*)(type)(\\s+)([a-zA-Z_][a-zA-Z0-9_]*)', - caseInsensitive: true, - push: - [ { token: - [ 'keyword.other.fortran', - 'meta.type-definition.fortran.modern', - 'storage.type.fortran.modern', - 'entity.name.type.end.fortran.modern' ], - regex: '(end)(\\s*)(?:(type))?((?:\\s+[A-Za-z_][A-Za-z0-9_]*)?)', - caseInsensitive: true, - next: 'pop' }, - { include: '$self' }, - { defaultToken: 'meta.type-definition.fortran.modern' } ] }, - comment: 'Type definition' }, - { token: 'punctuation.definition.comment.fortran', - regex: '!-', - push: - [ { token: 'comment.line.exclamation.mark.fortran.modern', - regex: '$', - next: 'pop' }, - { token: 'text', regex: '\\\\\\s*$' }, - { defaultToken: 'comment.line.exclamation.mark.fortran.modern' } ] }, - { token: 'punctuation.definition.comment.fortran', - regex: '!', - push: - [ { token: 'comment.line.exclamation.fortran.modern', - regex: '$', - next: 'pop' }, - { token: 'text', regex: '\\\\\\s*$' }, - { defaultToken: 'comment.line.exclamation.fortran.modern' } ] }, - { token: 'keyword.control.fortran.modern', - regex: '\\b(?:select\\s+case|case(?:\\s+default)?|end\\s+select|use|(?:end\\s+)?forall)\\b', - caseInsensitive: true, - comment: 'statements controling the flow of the program' }, - { token: 'keyword.control.io.fortran.modern', - regex: '\\b(?:access|action|advance|append|apostrophe|asis|blank|delete|delim|direct|end|eor|err|exist|file|fmt|form|formatted|iolength|iostat|keep|name|named|nextrec|new|nml|no|null|number|old|opened|pad|position|quote|read|readwrite|rec|recl|replace|scratch|sequential|size|status|undefined|unformatted|unit|unknown|write|yes|zero|namelist)(?=\\()', - caseInsensitive: true, - comment: 'input/output instrinsics' }, - { token: 'keyword.operator.logical.fortran.modern', - regex: '\\b(?:\\=\\=|\\/\\=|\\>\\=|\\>|\\<|\\<\\=)\\b', - comment: 'logical operators in symbolic format' }, - { token: 'keyword.operator.fortran.modern', - regex: '\\%|\\=\\>', - comment: 'operators' }, - { token: 'keyword.other.instrinsic.numeric.fortran.modern', - regex: '\\b(?:ceiling|floor|modulo)(?=\\()', - caseInsensitive: true, - comment: 'numeric instrinsics' }, - { token: 'keyword.other.instrinsic.array.fortran.modern', - regex: '\\b(?:allocate|allocated|deallocate)(?=\\()', - caseInsensitive: true, - comment: 'matrix/vector/array instrinsics' }, - { token: 'keyword.other.instrinsic.pointer.fortran.modern', - regex: '\\bassociated(?=\\()', - caseInsensitive: true, - comment: 'pointer instrinsics' }, - { token: 'keyword.other.programming-units.fortran.modern', - regex: '\\b(?:end\\s*)?(?:interface|procedure|module)\\b', - caseInsensitive: true, - comment: 'programming units' }, - { token: 'storage.type.fortran.modern', - regex: '\\btype(?=\\s*\\()\\b(?=.*::)', - caseInsensitive: true, - push: - [ { token: 'meta.specification.fortran.modern', - regex: '(?=!)|$', - next: 'pop' }, - { include: '$base' }, - { defaultToken: 'meta.specification.fortran.modern' } ], - comment: 'Line of type specification' }, - { token: 'storage.type.fortran.modern', - regex: '\\btype(?=\\s*\\()\\b', - caseInsensitive: true }, - { token: 'storage.modifier.fortran.modern', - regex: '\\b(?:optional|recursive|pointer|allocatable|target|private|public)\\b', - caseInsensitive: true } ] } - - this.normalizeRules(); -}; - -FortranModernHighlightRules.metaData = { comment: 'Specificities of Fortran >= 90', - fileTypes: [ 'f90', 'F90', 'f95', 'F95', 'f03', 'F03', 'f08', 'F08' ], - firstLineMatch: '(?i)-[*]- mode: f90 -[*]-', - keyEquivalent: '^~F', - name: 'Fortran - Modern', - scopeName: 'source.fortran.modern' } - - -oop.inherits(FortranModernHighlightRules, TextHighlightRules); - -exports.FortranModernHighlightRules = FortranModernHighlightRules; -}); \ No newline at end of file diff --git a/lib/ace/mode/html_twig.js b/lib/ace/mode/html_twig.js deleted file mode 100644 index f14a1450..00000000 --- a/lib/ace/mode/html_twig.js +++ /dev/null @@ -1,64 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Distributed under the BSD license: - * - * Copyright (c) 2012, Ajax.org B.V. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Ajax.org B.V. nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - * Contributor(s): - * - * - * - * ***** END LICENSE BLOCK ***** */ - -/* - THIS FILE WAS AUTOGENERATED BY mode.tmpl.js -*/ - -define(function(require, exports, module) { -"use strict"; - -var oop = require("../lib/oop"); -var TextMode = require("./text").Mode; -var Tokenizer = require("../tokenizer").Tokenizer; -var HTMLTwigHighlightRules = require("./html_twig_highlight_rules").HTMLTwigHighlightRules; -// TODO: pick appropriate fold mode -var FoldMode = require("./folding/cstyle").FoldMode; - -var Mode = function() { - var highlighter = new HTMLTwigHighlightRules(); - this.foldingRules = new FoldMode(); - this.$tokenizer = new Tokenizer(highlighter.getRules()); -}; -oop.inherits(Mode, TextMode); - -(function() { - this.lineCommentStart = "<%+#"; - this.blockComment = {start: "/*", end: "*/"}; - // Extra logic goes here. -}).call(Mode.prototype); - -exports.Mode = Mode; -}); \ No newline at end of file diff --git a/lib/ace/mode/html_twig_highlight_rules.js b/lib/ace/mode/html_twig_highlight_rules.js deleted file mode 100644 index 2a9e57a5..00000000 --- a/lib/ace/mode/html_twig_highlight_rules.js +++ /dev/null @@ -1,683 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Distributed under the BSD license: - * - * Copyright (c) 2012, Ajax.org B.V. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Ajax.org B.V. nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * ***** END LICENSE BLOCK ***** */ - -/* This file was autogenerated from https://raw.github.com/Anomareh/PHP-Twig.tmbundle/master/Syntaxes/HTML (Twig).tmLanguage (uuid: ) */ -/**************************************************************************************** - * IT MIGHT NOT BE PERFECT ...But it's a good start from an existing *.tmlanguage file. * - * fileTypes * - ****************************************************************************************/ - -define(function(require, exports, module) { -"use strict"; - -var oop = require("../lib/oop"); -var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; - -var HTMLTwigHighlightRules = function() { - // regexp must not have capturing parentheses. Use (?:) instead. - // regexps are ordered -> the first match is used - - this.$rules = { start: - [ { token: [ 'punctuation.definition.tag.html', 'entity.name.tag.html' ], - regex: '(<)([a-zA-Z0-9:]+)(?=[^>]*>)', - push: - [ { token: - [ 'punctuation.definition.tag.html', - 'meta.scope.between-tag-pair.html', - 'punctuation.definition.tag.html', - 'entity.name.tag.html', - 'punctuation.definition.tag.html' ], - regex: '(>)(<)(/)([a-zA-Z0-9:]+)(>)', - next: 'pop' }, - { include: '#tag-stuff' }, - { defaultToken: 'meta.tag.any.html' } ] }, - { token: - [ 'punctuation.definition.tag.html', - 'entity.name.tag.xml.html' ], - regex: '(<\\?)(xml)', - push: - [ { token: 'punctuation.definition.tag.html', - regex: '\\?>', - next: 'pop' }, - { include: '#tag-generic-attribute' }, - { include: '#string-double-quoted' }, - { include: '#string-single-quoted' }, - { defaultToken: 'meta.tag.preprocessor.xml.html' } ] }, - { token: 'punctuation.definition.comment.html', - regex: ')$\n |\\{%\\s+(if|for|spaceless|raw|autoescape|macro|)\n )', - foldingStopMarker: '(?x)\n (\n |^(?!.*?$\n |\\{%\\s+end(if|for|spaceless|raw|autoescape|macro|)\n )', - keyEquivalent: '^~T', - name: 'HTML (Twig)', - scopeName: 'text.html.twig' } - - -oop.inherits(HTMLTwigHighlightRules, TextHighlightRules); - -exports.HTMLTwigHighlightRules = HTMLTwigHighlightRules; -}); \ No newline at end of file