From d8966223ab4054c133eddca173c98f83ae074a84 Mon Sep 17 00:00:00 2001 From: Golmote Date: Mon, 31 Aug 2015 19:57:12 +0200 Subject: [PATCH] Smalltalk: Simplified patterns --- components/prism-smalltalk.js | 4 ++-- components/prism-smalltalk.min.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/prism-smalltalk.js b/components/prism-smalltalk.js index 0ffc59d20f..029ad93f31 100644 --- a/components/prism-smalltalk.js +++ b/components/prism-smalltalk.js @@ -3,7 +3,7 @@ Prism.languages.smalltalk = { 'string': /'(?:''|[^'])+'/, 'symbol': /#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i, 'block-arguments': { - pattern: /(\[\s*)(?=:)[^\[|]+?\|/, + pattern: /(\[\s*):[^\[|]*?\|/, lookbehind: true, inside: { 'variable': /:[\da-z]+/i, @@ -26,6 +26,6 @@ Prism.languages.smalltalk = { /\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/, /(?:\B-|\b)\d+(?:\.\d+)?(?:e-?\d+)?/ ], - 'operator': /[:=~<>]=|~~|\/\/|\\\\|>>|[!^=<>+\-*\/&|,@]/, + 'operator': /[<=]=?|:=|~[~=]|\/\/?|\\\\|>[>=]?|[!^+\-*&|,@]/, 'punctuation': /[.;:?\[\](){}]/ }; \ No newline at end of file diff --git a/components/prism-smalltalk.min.js b/components/prism-smalltalk.min.js index 505460cf2f..e57d55a370 100644 --- a/components/prism-smalltalk.min.js +++ b/components/prism-smalltalk.min.js @@ -1 +1 @@ -Prism.languages.smalltalk={comment:/"(?:""|[^"])+"/,string:/'(?:''|[^'])+'/,symbol:/#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i,"block-arguments":{pattern:/(\[\s*)(?=:)[^\[|]+?\|/,lookbehind:!0,inside:{variable:/:[\da-z]+/i,punctuation:/\|/}},"temporary-variables":{pattern:/\|[^|]+\|/,inside:{variable:/[\da-z]+/i,punctuation:/\|/}},keyword:/\b(?:nil|true|false|self|super|new)\b/,character:{pattern:/\$./,alias:"string"},number:[/\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/,/(?:\B-|\b)\d+(?:\.\d+)?(?:e-?\d+)?/],operator:/[:=~<>]=|~~|\/\/|\\\\|>>|[!^=<>+\-*\/&|,@]/,punctuation:/[.;:?\[\](){}]/}; \ No newline at end of file +Prism.languages.smalltalk={comment:/"(?:""|[^"])+"/,string:/'(?:''|[^'])+'/,symbol:/#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i,"block-arguments":{pattern:/(\[\s*):[^\[|]*?\|/,lookbehind:!0,inside:{variable:/:[\da-z]+/i,punctuation:/\|/}},"temporary-variables":{pattern:/\|[^|]+\|/,inside:{variable:/[\da-z]+/i,punctuation:/\|/}},keyword:/\b(?:nil|true|false|self|super|new)\b/,character:{pattern:/\$./,alias:"string"},number:[/\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/,/(?:\B-|\b)\d+(?:\.\d+)?(?:e-?\d+)?/],operator:/[<=]=?|:=|~[~=]|\/\/?|\\\\|>[>=]?|[!^+\-*&|,@]/,punctuation:/[.;:?\[\](){}]/}; \ No newline at end of file