Skip to content

Commit

Permalink
Update C# and Julia keywords.
Browse files Browse the repository at this point in the history
  • Loading branch information
zufuliu committed Aug 14, 2023
1 parent 3fb3db6 commit b882a2f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 19 deletions.
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Latest development builds (artifacts in Release configuration for each compiler
* [AWK](tools/lang/Awk.awk), up to GNU AWK 5.2.
* [Batch Script](tools/lang/Batch.bat), [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#batch)
* [blockdiag](tools/lang/blockdiag.diag), seqdiag, actdiag and nwdiag
* [C#](tools/lang/CSharp.cs), up to C# 11.0. [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#c)
* [C#](tools/lang/CSharp.cs), up to C# 12.0. [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#c)
* [Vala](https://wiki.gnome.org/Projects/Vala) 0.54
* C/C++, [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#cc)
* Objective-C/C++, [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#objective-cc)
Expand Down Expand Up @@ -85,7 +85,7 @@ Latest development builds (artifacts in Release configuration for each compiler
* [BeanShell](https://github.com/beanshell/beanshell)
* [JavaScript](tools/lang/JavaScript.js), up to ECMAScript 2023 with [JSX](https://facebook.github.io/jsx/) and [Web APIs](https://developer.mozilla.org/en-US/docs/Web/API).
* [JSON](https://www.json.org) and [JSON5](https://json5.org/) Document
* [Julia Script](tools/lang/Julia.jl), up to Julia 1.2. [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#julia)
* [Julia Script](tools/lang/Julia.jl), up to Julia 1.9. [Screenshots](https://github.com/zufuliu/notepad2/wiki/Screenshots#julia)
* [Kotlin](tools/lang/Kotlin.kt), up to Kotlin 1.7.
* LaTeX
* Lisp Script (Common Lisp, Clojure, Scheme, etc.)
Expand Down
2 changes: 1 addition & 1 deletion src/EditLexers/stlCSharp.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

static KEYWORDLIST Keywords_CSharp = {{
//++Autogenerated -- start of section automatically generated
"abstract add alias and as ascending async await base break by case catch checked class const continue "
"abstract add alias and args as ascending async await base break by case catch checked class const continue "
"default delegate descending do else enum equals event explicit extern false file finally fixed for foreach from "
"get global goto group if implicit in init interface internal into is join let lock managed "
"nameof namespace new not notnull null on operator or orderby out override params partial private protected public "
Expand Down
4 changes: 2 additions & 2 deletions src/EditLexers/stlJulia.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
static KEYWORDLIST Keywords_Julia = {{
//++Autogenerated -- start of section automatically generated
"abstract baremodule begin break catch const continue do else elseif end export finally for function global "
"if import in isa let local macro module mutable primitive quote return struct try type using var where while "
"if import in isa let local macro module mutable outer primitive quote return struct try type using var where while "

, // 1 code folding
"baremodule begin do for function if let macro module quote struct try type while "
Expand Down Expand Up @@ -67,7 +67,7 @@ static KEYWORDLIST Keywords_Julia = {{
, // 6 macro
"allocated assert async boundscheck cfunction debug deprecate distributed dump "
"elapsed enum error eval evalpoly everywhere fastmath fetch generated gensym goto "
"inbounds inferred info inline isdefined label logmsg lower macroexpand macroexpand1 noinline nospecialize "
"inbounds inferred info inline isdefined kwdef label logmsg lower macroexpand macroexpand1 noinline nospecialize "
"polly preserve printf profile propagate_inbounds pure show spawn spawnat specialize sprintf static sync "
"task test test_broken test_deprecated test_logs test_nowarn test_skip test_throws test_warn testset threads "
"time timed timev "
Expand Down
2 changes: 1 addition & 1 deletion tools/lang/C.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// C99 https://open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf
// C11 https://open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf
// C17 https://files.lhmouse.com/standards/ISO%20C%20N2176.pdf
// C23 https://open-std.org/JTC1/SC22/WG14/www/docs/n3054.pdf
// C23 https://open-std.org/JTC1/SC22/WG14/www/docs/n3096.pdf
// https://en.cppreference.com/w/c
// https://en.cppreference.com/w/c/header
// https://en.cppreference.com/w/c/links
Expand Down
4 changes: 2 additions & 2 deletions tools/lang/CPP.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// C++11 https://open-std.org/jtc1/sc22/wg21/docs/papers/2012/n3337.pdf
// C++11 https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2012/n3337.pdf
// C++14 https://github.com/cplusplus/draft/blob/main/papers/n4140.pdf
// C++17 https://open-std.org/jtc1/sc22/wg21/docs/papers/2017/n4659.pdf
// C++20 https://open-std.org/jtc1/sc22/wg21/docs/papers/2020/n4868.pdf
// C++23 https://isocpp.org/files/papers/N4917.pdf
// C++23 https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2023/n4950.pdf
// https://en.cppreference.com/w/cpp
// https://en.cppreference.com/w/cpp/header
// https://en.cppreference.com/w/cpp/links
Expand Down
4 changes: 2 additions & 2 deletions tools/lang/CSharp.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// C# 11.0 https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/
// C# 12.0 https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/
// https://github.com/dotnet/roslyn/blob/main/docs/Language%20Feature%20Status.md
// https://wiki.gnome.org/Projects/Vala
// https://wiki.gnome.org/Projects/Vala/Manual
Expand All @@ -25,7 +25,7 @@ virtual volatile
while

// Contextual keywords
add and alias ascending async await
add and alias args ascending async await
by descending
equals
file from
Expand Down
14 changes: 5 additions & 9 deletions tools/lang/Julia.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://julialang.org/
# 1.3 https://docs.julialang.org/
# 1.9 https://docs.julialang.org/

#! Keywords ===========================================================
# https://docs.julialang.org/en/v1/base/base/#Keywords-1
Expand All @@ -9,11 +9,13 @@ export
finally
global
else elseif
import
import in isa
local
outer
return
using
var
where

# reserved two-word sequences
abstract type
Expand All @@ -23,11 +25,6 @@ end
primitive type
end

# others
where
in
isa

#! Constant
ans
true
Expand Down Expand Up @@ -63,8 +60,8 @@ end

#! Core ===========================================================
# https://docs.julialang.org/en/v1/base/base/
# base/boot.jl
module Core
@kwdef
isa(x, type) -> Bool
ifelse(condition::Bool, x, y)
typeassert(x, type)
Expand Down Expand Up @@ -149,7 +146,6 @@ module Main end

#! Modules ===========================================================
# https://docs.julialang.org/en/v1/base/base/
# base/exports.jl
module Base
exit(code=0)
atexit(f)
Expand Down

0 comments on commit b882a2f

Please sign in to comment.