update ctags and editor files for new type definition keywords

JuliaLang · Feb 9, 2017 · dc84a12 · dc84a12
1 parent 1519a2f
commit dc84a12
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/contrib/Julia_Notepad++.xml b/contrib/Julia_Notepad++.xml
@@ -26,7 +26,7 @@
             <Keywords name="Folders in comment, close"></Keywords>
             <Keywords name="Keywords1">true false C_NULL Inf NaN Inf32 NaN32 nothing</Keywords>
             <Keywords name="Keywords2">AbstractArray AbstractMatrix AbstractRemoteRef AbstractSparseMatrix AbstractString AbstractVector Any ArgumentError Array Associative BigFloat BigInt BitArray BitMatrix BitVector Bool BunchKaufman Cchar Cdouble Cfloat Char CharString CholeskyDense CholeskyPivotedDense Cint Cintmax_t Clong Clonglong Colon Complex Complex128 Complex64 ComplexPair Cptrdiff_t Cshort Csize_t Cuchar Cuint Cuintmax_t Culong Culonglong Cushort DArray Dict Dims DisconnectException EOFError EachLine EnvHash ErrorException Exception Expr Factorization Filter Float Float32 Float64 Function GSVDDense IO IOBuffer IOStream ImaginaryUnit InsertionSort Int Int128 Int16 Int32 Int64 Int8 IntSet Integer KeyError LDLTTridiagonal LUDense LUTridiagonal LoadError LocalProcess Matrix MergeSort MethodError NTuple Number ObjectIdDict ObjectIdDict OrdinalRange ParseError PipeBuffer ProcessGroup Ptr QRDense QRPivotedDense QuickSort Range Range1 RangeIndex Ranges Rational Real Regex RegexMatch RegexMatchIterator RepString RevString Reverse SVDDense Set Signed SparseMatrixCSC SpawnNullStream Stat StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubDArray SubOrDArray SubString SymTridiagonal Symbol SystemError Task TCPSocket TimSort Tridiagonal Tuple Type TypeError UInt UInt128 UInt16 UInt32 UInt64 UInt8 UVError Union Unsigned VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef Zip</Keywords>
-            <Keywords name="Keywords3">abstract begin baremodule bitstype break catch ccall const continue do else elseif end export finally for function global if immutable import importall let local macro module quote return try type typealias using while</Keywords>
+            <Keywords name="Keywords3">abstract begin baremodule primitive break catch ccall const continue do else elseif end export finally for function global if struct import importall let local macro module quote return try mutable typealias using while</Keywords>
             <Keywords name="Keywords4">close enumerate error info open print println read write warn</Keywords>
             <Keywords name="Keywords5">print println</Keywords>
             <Keywords name="Keywords6"></Keywords>

diff --git a/contrib/ctags b/contrib/ctags
@@ -1,4 +1,4 @@
 --langdef=julia
 --langmap=julia:.jl
---regex-julia=/^[ \t]*(function|macro|abstract|type|typealias|immutable)[ \t]+([^ \t({[]+).*$/\2/f,function/
+--regex-julia=/^[ \t]*(function|macro|abstract type|primitive type|struct|mutable struct|typealias)[ \t]+([^ \t({[]+).*$/\2/f,function/
 --regex-julia=/^[ \t]*(([^@#$ \t({[]+)|\(([^@#$ \t({[]+)\)|\((\$)\))[ \t]*(\{.*\})?[ \t]*\([^#]*\)[ \t]*=([^=].*$|$)/\2\3\4/f,function/
diff --git a/contrib/julia.hrc b/contrib/julia.hrc
@@ -34,8 +34,8 @@
          <block start="/(\bfor\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
          <block start="/(\bif\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
          <block start="/(\bwhile\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
-         <block start="/(\btype\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
-         <block start="/(\bimmutable\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
+         <block start="/(\bmutable struct\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
+         <block start="/(\bstruct\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
          <block start="/(\bmacro\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
          <block start="/(\bquote\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
          <block start="/(\bmodule\b)/" end="/(\bend\b)/" scheme="julia" region00="mlKeyWord" region01="PairStart" region10="mlKeyWord" region11="PairEnd"/>
@@ -85,27 +85,27 @@
             <word name="catch"/>
             <word name="finally"/>
             <word name="const"/>
-            <word name="immutable"/>
+            <word name="struct"/>
             <word name="import"/>
             <word name="importall"/>
             <word name="export"/>
-            <word name="type"/>
+            <word name="mutable struct"/>
             <word name="typealias"/>
             <word name="return"/>
             <word name="true"/>
             <word name="false"/>
             <word name="macro"/>
             <word name="quote"/>
             <word name="in"/>
-            <word name="abstract"/>
+            <word name="abstract type"/>
             <word name="module"/>
             <word name="using"/>
             <word name="continue"/>
             <word name="do"/>
             <word name="let"/>
             <word name="begin"/>
             <word name="local"/>
-            <word name="bitstype"/>
+            <word name="primitive type"/>
             <word name="baremodule"/>
          </keywords>
 <!-- General types -->

diff --git a/contrib/julia.lang b/contrib/julia.lang
@@ -154,20 +154,20 @@
       <keyword>in</keyword>
       <keyword>function</keyword>
       <keyword>if</keyword>
-      <keyword>immutable</keyword>
+      <keyword>struct</keyword>
       <keyword>let</keyword>
       <keyword>quote</keyword>
       <keyword>try</keyword>
-      <keyword>type</keyword>
+      <keyword>mutable type</keyword>
       <keyword>while</keyword>
       <keyword>catch</keyword>
       <keyword>finally</keyword>
       <keyword>else</keyword>
       <keyword>elseif</keyword>
       <keyword>end</keyword>
       <!-- keywords -->
-      <keyword>abstract</keyword>
-      <keyword>bitstype</keyword>
+      <keyword>abstract type</keyword>
+      <keyword>primitive type</keyword>
       <keyword>break</keyword>
       <keyword>ccall</keyword>
       <keyword>const</keyword>

diff --git a/contrib/julia.xml b/contrib/julia.xml
@@ -38,11 +38,11 @@
       <item> for </item>
       <item> function </item>
       <item> if </item>
-      <item> immutable </item>
+      <item> struct </item>
       <item> let </item>
       <item> quote </item>
       <item> try </item>
-      <item> type </item>
+      <item> mutable struct </item>
       <item> while </item>
     </list>
     <list name="block_eb">
@@ -55,8 +55,8 @@
       <item> end </item>
     </list>
     <list name="keywords">
-      <item> abstract </item>
-      <item> bitstype </item>
+      <item> abstract type </item>
+      <item> primitive type </item>
       <item> break </item>
       <item> ccall </item>
       <item> const </item>