diff --git a/contrib/Julia_Notepad++.xml b/contrib/Julia_Notepad++.xml index 7dbb125adb3b0..2f7f3804b7552 100644 --- a/contrib/Julia_Notepad++.xml +++ b/contrib/Julia_Notepad++.xml @@ -12,7 +12,7 @@ end "00"00 abstract bitstype break ccall const continue export global import importall in local macro module baremodule return typealias using - AbstractArray AbstractMatrix AbstractSparseMatrix AbstractVector Any Array ASCIIString Associative AsyncStream BitArray BigFloat BigInt BitMatrix BitVector Bool ByteString Char CharString Colon Complex Complex64 Complex128 ComplexPair DArray Dict Dims EachLine EnvHash Exception Expr FileOffset Filter Float Float32 Float64 Function ObjectIdDict Int Int8 Int16 Int32 Int64 Int128 Integer IntSet ImaginaryUnit IO IOBuffer IOStream LocalProcess Matrix NTuple Number ObjectIdDict OrdinalRange PipeBuffer ProcessGroup Ptr Range Range1 RangeIndex Ranges Rational Real Regex RegexMatch RegexMatchIterator RemoteRef RepString RevString Reverse RopeString Set Signed SparseMatrixCSC SpawnNullStream StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubDArray SubOrDArray SubString Symbol SymTridiagonal Task TcpSocket Tridiagonal Tuple Type Uint Uint8 Uint16 Uint32 Uint64 Uint128 Union Unsigned UTF8String UVError VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef Woodbury Zip Stat Factorization BunchKaufman CholeskyDense CholeskyPivotedDense LUDense LUTridiagonal LDLTTridiagonal QRDense QRPivotedDense SVDDense GSVDDense InsertionSort QuickSort MergeSort TimSort Cchar Cuchar Cshort Cushort Cint Cuint Clong Culong Cptrdiff_t Csize_t Clonglong Culonglong Cintmax_t Cuintmax_t Cfloat Cdouble ArgumentError DisconnectException EOFError ErrorException KeyError LoadError MethodError ParseError SystemError TypeError + AbstractArray AbstractMatrix AbstractSparseMatrix AbstractVector Any Array ASCIIString Associative AsyncStream BitArray BigFloat BigInt BitMatrix BitVector Bool ByteString Char CharString Colon Complex Complex64 Complex128 ComplexPair DArray Dict Dims EachLine EnvHash Exception Expr FileOffset Filter Float Float32 Float64 Function ObjectIdDict Int Int8 Int16 Int32 Int64 Int128 Integer IntSet ImaginaryUnit IO IOBuffer IOStream LocalProcess Matrix NTuple Number ObjectIdDict OrdinalRange PipeBuffer ProcessGroup Ptr Range Range1 RangeIndex Ranges Rational Real Regex RegexMatch RegexMatchIterator RemoteRef RepString RevString Reverse RopeString Set Signed SparseMatrixCSC SpawnNullStream StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubDArray SubOrDArray SubString Symbol SymTridiagonal Task TcpSocket Tridiagonal Tuple Type UInt UInt8 UInt16 UInt32 UInt64 UInt128 Union Unsigned UTF8String UVError VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef Woodbury Zip Stat Factorization BunchKaufman CholeskyDense CholeskyPivotedDense LUDense LUTridiagonal LDLTTridiagonal QRDense QRPivotedDense SVDDense GSVDDense InsertionSort QuickSort MergeSort TimSort Cchar Cuchar Cshort Cushort Cint Cuint Clong Culong Cptrdiff_t Csize_t Clonglong Culonglong Cintmax_t Cuintmax_t Cfloat Cdouble ArgumentError DisconnectException EOFError ErrorException KeyError LoadError MethodError ParseError SystemError TypeError diff --git a/contrib/julia-mode.el b/contrib/julia-mode.el index afb18c8f56e73..0d71c08f599b2 100644 --- a/contrib/julia-mode.el +++ b/contrib/julia-mode.el @@ -179,7 +179,7 @@ This function provides equivalent functionality, but makes no efforts to optimis (defconst julia-builtin-types-regex (julia--regexp-opt '("Number" "Real" "BigInt" "Integer" - "Uint" "Uint8" "Uint16" "Uint32" "Uint64" "Uint128" + "UInt" "UInt8" "UInt16" "UInt32" "UInt64" "UInt128" "Int" "Int8" "Int16" "Int32" "Int64" "Int128" "BigFloat" "FloatingPoint" "Float16" "Float32" "Float64" "Complex128" "Complex64" "ComplexPair" diff --git a/contrib/julia.hrc b/contrib/julia.hrc index 4b4f0e44a3df8..6849b19212088 100644 --- a/contrib/julia.hrc +++ b/contrib/julia.hrc @@ -129,11 +129,11 @@ - - - - - + + + + + diff --git a/contrib/julia.lang b/contrib/julia.lang index af2187f56da3b..fc05c41fa2f55 100644 --- a/contrib/julia.lang +++ b/contrib/julia.lang @@ -247,7 +247,7 @@ ImaginaryUnit Signed|Unsigned Int(eger|Set|8|16|32|64|128)? - Uint(8|16|32|64|128)? + UInt(8|16|32|64|128)? Float(ingPoint|16|32|64) Complex(Pair|64|128)? Big(Int|Float) diff --git a/contrib/julia.xml b/contrib/julia.xml index 4d538c2aa3376..80f7fdfd2a1a5 100644 --- a/contrib/julia.xml +++ b/contrib/julia.xml @@ -192,12 +192,12 @@ Tridiagonal Tuple Type - Uint - Uint8 - Uint16 - Uint32 - Uint64 - Uint128 + UInt + UInt8 + UInt16 + UInt32 + UInt64 + UInt128 Union Unsigned UTF8String