Merge pull request #9019 from simonbyrne/uint-contrib

rename Uint -> UInt in contrib files for syntax highlighting
JuliaLang · Nov 15, 2014 · 74b8a6b · 74b8a6b
2 parents a06e938 + a8d2604
commit 74b8a6b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/contrib/Julia_Notepad++.xml b/contrib/Julia_Notepad++.xml
@@ -12,7 +12,7 @@
             <Keywords name="Folders in code1, close">end</Keywords>
             <Keywords name="Delimiters">&quot;00&quot;00</Keywords>
             <Keywords name="Keywords1">abstract bitstype break ccall const continue export global import importall in local macro module baremodule return typealias using</Keywords>
-            <Keywords name="Keywords2">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</Keywords>
+            <Keywords name="Keywords2">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</Keywords>
         </KeywordLists>
         <Styles>
             <WordsStyle name="DEFAULT" fgColor="000000" bgColor="FFFFFF" fontStyle="0" />

diff --git 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
@@ -129,11 +129,11 @@
             <word name="AbstractArray"/>
             <word name="Unsigned"/>
             <word name="Signed"/>
-            <word name="Uint"/>
-            <word name="Uint8"/>
-            <word name="Uint16"/>
-            <word name="Uint32"/>
-            <word name="Uint64"/>
+            <word name="UInt"/>
+            <word name="UInt8"/>
+            <word name="UInt16"/>
+            <word name="UInt32"/>
+            <word name="UInt64"/>
             <word name="Vector"/>
             <word name="AbstractVector"/>
             <word name="Matrix"/>

diff --git a/contrib/julia.lang b/contrib/julia.lang
@@ -247,7 +247,7 @@
       <keyword>ImaginaryUnit</keyword>
       <keyword>Signed|Unsigned</keyword>
       <keyword>Int(eger|Set|8|16|32|64|128)?</keyword>
-      <keyword>Uint(8|16|32|64|128)?</keyword>
+      <keyword>UInt(8|16|32|64|128)?</keyword>
       <keyword>Float(ingPoint|16|32|64)</keyword>
       <keyword>Complex(Pair|64|128)?</keyword>
       <keyword>Big(Int|Float)</keyword>

diff --git a/contrib/julia.xml b/contrib/julia.xml
@@ -192,12 +192,12 @@
       <item> Tridiagonal </item>
       <item> Tuple </item>
       <item> Type </item>
-      <item> Uint </item>
-      <item> Uint8 </item>
-      <item> Uint16 </item>
-      <item> Uint32 </item>
-      <item> Uint64 </item>
-      <item> Uint128 </item>
+      <item> UInt </item>
+      <item> UInt8 </item>
+      <item> UInt16 </item>
+      <item> UInt32 </item>
+      <item> UInt64 </item>
+      <item> UInt128 </item>
       <item> Union </item>
       <item> Unsigned </item>
       <item> UTF8String </item>