Skip to content

Moonscript: add from keyword #2233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jneen merged 4 commits into from
Feb 27, 2026
+9 −14
Merged

Moonscript: add from keyword #2233

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37cb774
moonscript: use a lazy { ... } block instead of overriding eager_load!
Feb 27, 2026
63e0f53
moonscript: add the `from` keyword
Feb 27, 2026
c33ed1a
remove ident string (?) which was just \w+ anyways
Feb 27, 2026
0afa210
use more standard ruby regex features
Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions lib/rouge/lexers/moonscript.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ class Moonscript < RegexLexer
option :disabled_modules, 'builtin modules to disable'

# depends on lua builtins
def self.eager_load!
super
Lua.eager_load!
end
lazy { Lua.eager_load! }

def initialize(*)
super
Expand Down Expand Up @@ -50,31 +47,29 @@ def builtins
end

state :base do
ident = '(?:\w\w*)'

rule %r((?i)(\d*\.\d+|\d+\.\d*)(e[+-]?\d+)?'), Num::Float
rule %r((?i)\d+e[+-]?\d+), Num::Float
rule %r((?i)0x[0-9a-f]*), Num::Hex
rule %r((\d*\.\d+|\d+\.\d*)(e[+-]?\d+)?')i, Num::Float
rule %r(\d+e[+-]?\d+)i, Num::Float
rule %r(0x\h*), Num::Hex
rule %r(\d+), Num::Integer
rule %r(@#{ident}*), Name::Variable::Instance
rule %r(@\w+), Name::Variable::Instance
rule %r([A-Z]\w*), Name::Class
rule %r("?[^"]+":), Literal::String::Symbol
rule %r(#{ident}:), Literal::String::Symbol
rule %r(:#{ident}), Literal::String::Symbol
rule %r(\w+:), Literal::String::Symbol
rule %r(:\w+), Literal::String::Symbol

rule %r(\s+), Text::Whitespace
rule %r((==|~=|!=|<=|>=|\.\.\.|\.\.|->|=>|[=+\-*/%^<>#!\\])), Operator
rule %r([\[\]\{\}\(\)\.,:;]), Punctuation
rule %r((and|or|not)\b), Operator::Word

keywords = Set.new %w{
break class continue do else elseif end extends for if import in
break class continue do else elseif end extends for if import in from
repeat return switch super then unless until using when with while
}
rule %r((local|export)\b), Keyword::Declaration
rule %r((true|false|nil)\b), Keyword::Constant

rule %r([A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)?) do |m|
rule %r([a-z_]\w*(\.[a-z_]\w*)?)i do |m|
name = m[0]
if keywords.include?(name)
token Keyword
Expand Down
⚡