[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/julia-mode 8449c95 295/352: Merge pull request #69 from em
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/julia-mode 8449c95 295/352: Merge pull request #69 from emmt/master |
Date: |
Sun, 29 Aug 2021 11:23:05 -0400 (EDT) |
branch: elpa/julia-mode
commit 8449c95a05ab5d75a48192c2da7f0e7f4d16714c
Merge: 9edff28 117b791
Author: Yichao Yu <yyc1992@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #69 from emmt/master
Update keywords and builtin types to Julia 1.0
---
julia-mode.el | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/julia-mode.el b/julia-mode.el
index d54953b..3263507 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -117,6 +117,8 @@ This function provides equivalent functionality, but makes
no efforts to optimis
(modify-syntax-entry ?< "." table)
(modify-syntax-entry ?> "." table)
(modify-syntax-entry ?% "." table)
+
+ (modify-syntax-entry ?′ "w" table) ; \prime is a word constituent
table)
"Syntax table for `julia-mode'.")
@@ -242,7 +244,7 @@ This function provides equivalent functionality, but makes
no efforts to optimis
(not (any "="))))
(defconst julia-type-regex
- (rx symbol-start (or "immutable" "type" ;; remove after 0.6
+ (rx symbol-start (or ;;"immutable" "type" ;; remove after 0.6
"abstract type" "primitive type" "struct" "mutable
struct")
(1+ space) (group (1+ (or word (syntax symbol))))))
@@ -264,8 +266,9 @@ This function provides equivalent functionality, but makes
no efforts to optimis
"try" "catch" "return" "local" "function" "macro" "ccall"
"finally" "break" "continue" "global" "where"
"module" "using" "import" "export" "const" "let" "do" "in"
- "baremodule" "importall"
- "immutable" "type" "bitstype" "abstract" "typealias" ;; remove after 0.6
+ "baremodule"
+ ;; "importall" ;; deprecated in 0.7
+ ;; "immutable" "type" "bitstype" "abstract" "typealias" ;; removed in 1.0
"abstract type" "primitive type" "struct" "mutable struct")
'symbols))
@@ -281,16 +284,18 @@ This function provides equivalent functionality, but
makes no efforts to optimis
"UInt" "UInt8" "UInt16" "UInt32" "UInt64" "UInt128"
"Int" "Int8" "Int16" "Int32" "Int64" "Int128"
"BigFloat" "AbstractFloat" "Float16" "Float32" "Float64"
- "Complex128" "Complex64"
+ ;;"Complex128" "Complex64" ;; replaced in 1.0
+ "ComplexF32" "ComplexF64"
"Bool"
"Cuchar" "Cshort" "Cushort" "Cint" "Cuint" "Clonglong" "Culonglong"
"Cintmax_t" "Cuintmax_t"
"Cfloat" "Cdouble" "Cptrdiff_t" "Cssize_t" "Csize_t"
- "Cchar" "Clong" "Culong" "Cwchar_t"
+ "Cchar" "Clong" "Culong" "Cwchar_t" "Cvoid"
+ "Cstring" "Cwstring" ;; C strings made of ordinary and wide characters
"Char" "String" "SubString"
"Array" "DArray" "AbstractArray" "AbstractVector" "AbstractMatrix"
"AbstractSparseMatrix" "SubArray" "StridedArray" "StridedVector"
"StridedMatrix" "VecOrMat" "StridedVecOrMat" "DenseArray" "SparseMatrixCSC"
"BitArray"
- "Range" "OrdinalRange" "StepRange" "UnitRange" "FloatRange"
+ "AbstractRange" "OrdinalRange" "StepRange" "UnitRange" "FloatRange"
"Tuple" "NTuple" "Vararg"
- "DataType" "Symbol" "Function" "Vector" "Matrix" "Union" "Type" "Any"
"Complex" "AbstractString" "Ptr" "Void" "Exception" "Task" "Signed" "Unsigned"
"Associative" "Dict" "IO" "IOStream" "Rational" "Regex" "RegexMatch" "Set"
"IntSet" "Expr" "WeakRef" "ObjectIdDict"
+ "DataType" "Symbol" "Function" "Vector" "Matrix" "Union" "Type" "Any"
"Complex" "AbstractString" "Ptr" "Nothing" "Exception" "Task" "Signed"
"Unsigned" "AbstractDict" "Dict" "IO" "IOStream" "Rational" "Regex"
"RegexMatch" "Set" "BitSet" "Expr" "WeakRef" "ObjectIdDict"
"AbstractRNG" "MersenneTwister"
)
'symbols))
@@ -313,7 +318,7 @@ This function provides equivalent functionality, but makes
no efforts to optimis
(cons julia-macro-regex ''julia-macro-face)
(cons
(julia--regexp-opt
- '("true" "false" "C_NULL" "Inf" "NaN" "Inf32" "NaN32" "nothing")
+ '("true" "false" "C_NULL" "Inf" "NaN" "Inf32" "NaN32" "nothing" "undef")
'symbols)
'font-lock-constant-face)
(list julia-unquote-regex 2 'font-lock-constant-face)
@@ -330,7 +335,7 @@ This function provides equivalent functionality, but makes
no efforts to optimis
(defconst julia-block-start-keywords
(list "if" "while" "for" "begin" "try" "function" "let" "macro"
"quote" "do" "module"
- "immutable" "type" ;; remove after 0.6
+ ;; "immutable" "type" ;; remove after 0.6
"abstract type" "primitive type" "struct" "mutable struct"))
;; For keywords that begin a block without additional indentation
- [nongnu] elpa/julia-mode 70bbe82 204/352: Adding unit tests for indentation., (continued)
- [nongnu] elpa/julia-mode 70bbe82 204/352: Adding unit tests for indentation., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode ff8adf5 221/352: Add tests for #11684. [ci skip], ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 8ab2a60 222/352: julia-paren-indent skips blanks after paren, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode c8dfbe2 227/352: Declare indentation as customizable, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 011435c 237/352: julia-mode: Fix indent for hanging ops and module, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode c2f0ed8 235/352: julia-mode: Fix prompt regexp, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode a95b06b 252/352: Merge pull request #20 from tpapp/indent-export, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 847908e 249/352: Add indent for import and export., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 7b1d3fb 253/352: Merge pull request #21 from kshramt/python-paren-indent, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode f591c6d 275/352: Merge pull request #41 from rfourquet/rf/where-return, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 8449c95 295/352: Merge pull request #69 from emmt/master,
ELPA Syncer <=
- [nongnu] elpa/julia-mode 47d2fb0 282/352: Merge pull request #51 from non-Jedi/arg-list, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode e27e6d2 290/352: fix compilation error, silence byte-compiler warnings in emacs>23, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 7102542 304/352: fix tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 646f758 156/352: Don't skip over end keywords., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 11e3904 176/352: Backporting regexp-opt functionality to Emacs 23., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 36aa038 181/352: Fix julia-in-brackets so it isn't confused by strings, characters or comments., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode d7a7607 184/352: Make julia-last-open-block-pos a pure function that only returns the position., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 3597e9a 186/352: Comment improvements., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 6603c79 190/352: rename Uint -> UInt in contrib files for syntax highlighting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode f3f2ad1 198/352: Highlight triple quoted strings., ELPA Syncer, 2021/08/29