From 94b3ea3df51edf6a7cfbd26016642e01844eb20e Mon Sep 17 00:00:00 2001 From: Kashif Rasul Date: Tue, 5 Nov 2013 10:57:12 +0100 Subject: [PATCH 1/4] added cuda lexer and removed example from c++ samples --- lib/linguist/languages.yml | 6 ++++ samples/C++/cuda.cu | 39 ---------------------- samples/Cuda/scalarProd_kernel.cuh | 52 ++++++++++++++++++++++++++++++ samples/Cuda/vectorAdd.cu | 46 ++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 39 deletions(-) delete mode 100644 samples/C++/cuda.cu create mode 100644 samples/Cuda/scalarProd_kernel.cuh create mode 100644 samples/Cuda/vectorAdd.cu diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 33de0c01..dfa1fe03 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -327,6 +327,12 @@ Cucumber: lexer: Gherkin primary_extension: .feature +Cuda: + lexer: CUDA + primary_extension: .cu + extensions: + - .cuh + Cython: type: programming group: Python diff --git a/samples/C++/cuda.cu b/samples/C++/cuda.cu deleted file mode 100644 index ddef40cd..00000000 --- a/samples/C++/cuda.cu +++ /dev/null @@ -1,39 +0,0 @@ -void foo() -{ - cudaArray* cu_array; - texture tex; - - // Allocate array - cudaChannelFormatDesc description = cudaCreateChannelDesc(); - cudaMallocArray(&cu_array, &description, width, height); - - // Copy image data to array - cudaMemcpyToArray(cu_array, image, width*height*sizeof(float), cudaMemcpyHostToDevice); - - // Set texture parameters (default) - tex.addressMode[0] = cudaAddressModeClamp; - tex.addressMode[1] = cudaAddressModeClamp; - tex.filterMode = cudaFilterModePoint; - tex.normalized = false; // do not normalize coordinates - - // Bind the array to the texture - cudaBindTextureToArray(tex, cu_array); - - // Run kernel - dim3 blockDim(16, 16, 1); - dim3 gridDim((width + blockDim.x - 1)/ blockDim.x, (height + blockDim.y - 1) / blockDim.y, 1); - kernel<<< gridDim, blockDim, 0 >>>(d_data, height, width); - - // Unbind the array from the texture - cudaUnbindTexture(tex); -} //end foo() - -__global__ void kernel(float* odata, int height, int width) -{ - unsigned int x = blockIdx.x*blockDim.x + threadIdx.x; - unsigned int y = blockIdx.y*blockDim.y + threadIdx.y; - if (x < width && y < height) { - float c = tex2D(tex, x, y); - odata[y*width+x] = c; - } -} diff --git a/samples/Cuda/scalarProd_kernel.cuh b/samples/Cuda/scalarProd_kernel.cuh new file mode 100644 index 00000000..7622c597 --- /dev/null +++ b/samples/Cuda/scalarProd_kernel.cuh @@ -0,0 +1,52 @@ +__global__ void scalarProdGPU( + float *d_C, + float *d_A, + float *d_B, + int vectorN, + int elementN +) +{ + //Accumulators cache + __shared__ float accumResult[ACCUM_N]; + + //////////////////////////////////////////////////////////////////////////// + // Cycle through every pair of vectors, + // taking into account that vector counts can be different + // from total number of thread blocks + //////////////////////////////////////////////////////////////////////////// + for (int vec = blockIdx.x; vec < vectorN; vec += gridDim.x) + { + int vectorBase = IMUL(elementN, vec); + int vectorEnd = vectorBase + elementN; + + //////////////////////////////////////////////////////////////////////// + // Each accumulator cycles through vectors with + // stride equal to number of total number of accumulators ACCUM_N + // At this stage ACCUM_N is only preferred be a multiple of warp size + // to meet memory coalescing alignment constraints. + //////////////////////////////////////////////////////////////////////// + for (int iAccum = threadIdx.x; iAccum < ACCUM_N; iAccum += blockDim.x) + { + float sum = 0; + + for (int pos = vectorBase + iAccum; pos < vectorEnd; pos += ACCUM_N) + sum += d_A[pos] * d_B[pos]; + + accumResult[iAccum] = sum; + } + + //////////////////////////////////////////////////////////////////////// + // Perform tree-like reduction of accumulators' results. + // ACCUM_N has to be power of two at this stage + //////////////////////////////////////////////////////////////////////// + for (int stride = ACCUM_N / 2; stride > 0; stride >>= 1) + { + __syncthreads(); + + for (int iAccum = threadIdx.x; iAccum < stride; iAccum += blockDim.x) + accumResult[iAccum] += accumResult[stride + iAccum]; + } + + if (threadIdx.x == 0) d_C[vec] = accumResult[0]; + } +} \ No newline at end of file diff --git a/samples/Cuda/vectorAdd.cu b/samples/Cuda/vectorAdd.cu new file mode 100644 index 00000000..cdc21dff --- /dev/null +++ b/samples/Cuda/vectorAdd.cu @@ -0,0 +1,46 @@ +#include +#include + +/** + * CUDA Kernel Device code + * + * Computes the vector addition of A and B into C. The 3 vectors have the same + * number of elements numElements. + */ +__global__ void +vectorAdd(const float *A, const float *B, float *C, int numElements) +{ + int i = blockDim.x * blockIdx.x + threadIdx.x; + + if (i < numElements) + { + C[i] = A[i] + B[i]; + } +} + +/** + * Host main routine + */ +int +main(void) +{ + // Error code to check return values for CUDA calls + cudaError_t err = cudaSuccess; + + // Launch the Vector Add CUDA Kernel + int threadsPerBlock = 256; + int blocksPerGrid =(numElements + threadsPerBlock - 1) / threadsPerBlock; + vectorAdd<<>>(d_A, d_B, d_C, numElements); + err = cudaGetLastError(); + + if (err != cudaSuccess) + { + fprintf(stderr, "Failed to launch vectorAdd kernel (error code %s)!\n", cudaGetErrorString(err)); + exit(EXIT_FAILURE); + } + + // Reset the device and exit + err = cudaDeviceReset(); + + return 0; +} \ No newline at end of file From b30163444f1db770a79fd8a86201eb4202884b7d Mon Sep 17 00:00:00 2001 From: Kashif Rasul Date: Tue, 5 Nov 2013 22:02:41 +0100 Subject: [PATCH 2/4] checked in updated samples.json --- lib/linguist/samples.json | 756 ++++++++++++++++++++++++++++++++++---- 1 file changed, 679 insertions(+), 77 deletions(-) diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json index 32d17697..f67830f0 100644 --- a/lib/linguist/samples.json +++ b/lib/linguist/samples.json @@ -28,13 +28,21 @@ "C++": [ ".cc", ".cpp", - ".cu", ".h", ".hpp" ], "Ceylon": [ ".ceylon" ], + "Clojure": [ + ".cl2", + ".clj", + ".cljc", + ".cljs", + ".cljscm", + ".cljx", + ".hic" + ], "COBOL": [ ".cbl", ".ccp", @@ -53,12 +61,19 @@ "CSS": [ ".css" ], + "Cuda": [ + ".cu", + ".cuh" + ], "Dart": [ ".dart" ], "Diff": [ ".patch" ], + "DM": [ + ".dm" + ], "Ecl": [ ".ecl" ], @@ -111,9 +126,15 @@ ".handlebars", ".hbs" ], + "Idris": [ + ".idr" + ], "Ioke": [ ".ik" ], + "Jade": [ + ".jade" + ], "Java": [ ".java" ], @@ -132,6 +153,9 @@ "Kotlin": [ ".kt" ], + "KRL": [ + ".krl" + ], "Lasso": [ ".las", ".lasso", @@ -249,6 +273,9 @@ "Prolog": [ ".pl" ], + "Protocol Buffer": [ + ".proto" + ], "Python": [ ".py", ".script!" @@ -267,6 +294,9 @@ "Rebol": [ ".r" ], + "RobotFramework": [ + ".robot" + ], "Ruby": [ ".pluginspec", ".rabl", @@ -285,6 +315,9 @@ ".sbt", ".script!" ], + "Scaml": [ + ".scaml" + ], "Scheme": [ ".sps" ], @@ -424,8 +457,8 @@ ".gemrc" ] }, - "tokens_total": 415313, - "languages_total": 458, + "tokens_total": 416836, + "languages_total": 475, "tokens": { "ABAP": { "*/**": 1, @@ -7735,82 +7768,17 @@ "C++": { "class": 34, "Bar": 2, - "{": 553, + "{": 550, "protected": 4, "char": 122, "*name": 6, - ";": 2308, + ";": 2290, "public": 27, - "void": 152, + "void": 150, "hello": 2, - "(": 2438, - ")": 2440, - "}": 552, - "foo": 2, - "cudaArray*": 1, - "cu_array": 4, - "texture": 1, - "": 1, - "2": 1, - "cudaReadModeElementType": 1, - "tex": 4, - "cudaChannelFormatDesc": 1, - "description": 5, - "cudaCreateChannelDesc": 1, - "": 1, - "cudaMallocArray": 1, - "&": 148, - "width": 5, - "height": 5, - "cudaMemcpyToArray": 1, - "image": 1, - "width*height*sizeof": 1, - "float": 9, - "cudaMemcpyHostToDevice": 1, - "tex.addressMode": 2, - "[": 204, - "]": 204, - "cudaAddressModeClamp": 2, - "tex.filterMode": 1, - "cudaFilterModePoint": 1, - "tex.normalized": 1, - "false": 43, - "//": 239, - "do": 5, - "not": 2, - "normalize": 1, - "coordinates": 1, - "cudaBindTextureToArray": 1, - "dim3": 2, - "blockDim": 2, - "gridDim": 2, - "+": 55, - "blockDim.x": 2, - "-": 227, - "/": 15, - "blockDim.y": 2, - "kernel": 2, - "<<": 19, - "<": 56, - "d_data": 1, - "cudaUnbindTexture": 1, - "//end": 1, - "__global__": 1, - "float*": 1, - "odata": 2, - "int": 148, - "unsigned": 22, - "x": 48, - "blockIdx.x*blockDim.x": 1, - "threadIdx.x": 1, - "y": 16, - "blockIdx.y*blockDim.y": 1, - "threadIdx.y": 1, - "if": 296, - "&&": 24, - "c": 52, - "tex2D": 1, - "y*width": 1, + "(": 2422, + ")": 2424, + "}": 549, "#include": 106, "": 1, "": 1, @@ -7822,6 +7790,7 @@ "NULL": 108, "*Env": 1, "instance": 4, + "if": 295, "env_instance": 3, "new": 9, "return": 147, @@ -7836,11 +7805,13 @@ "envvar": 2, "name": 21, "value": 18, + "int": 144, "indexOfEquals": 5, "for": 18, "env": 3, "envp": 4, "*env": 1, + "+": 50, "envvar.indexOf": 1, "continue": 2, "envvar.left": 1, @@ -7857,6 +7828,7 @@ "*instance": 1, "private": 12, "#endif": 82, + "//": 238, "GDSDBREADER_H": 3, "": 1, "GDS_DIR": 1, @@ -7913,6 +7885,7 @@ "A": 1, "friend": 10, "stream": 5, + "<<": 18, "myclass.label": 2, "myclass.depth": 2, "myclass.userIndex": 2, @@ -7926,6 +7899,7 @@ "myclass.firstLineData": 4, "myclass.linesNumbers": 2, "QDataStream": 2, + "&": 146, "myclass": 1, "//Don": 1, "read": 1, @@ -7972,6 +7946,7 @@ "ECDSA_SIG_recover_key_GFp": 3, "ECDSA_SIG": 3, "*ecsig": 1, + "unsigned": 20, "*msg": 2, "msglen": 2, "recid": 3, @@ -7990,10 +7965,13 @@ "*zero": 1, "n": 28, "i": 47, + "/": 13, + "-": 225, "BN_CTX_start": 1, "order": 8, "BN_CTX_get": 8, "EC_GROUP_get_order": 1, + "x": 44, "BN_copy": 1, "BN_mul_word": 1, "BN_add": 1, @@ -8032,6 +8010,7 @@ "fCompressedPubKey": 5, "true": 39, "Reset": 5, + "false": 42, "EC_KEY_new_by_curve_name": 2, "NID_secp256k1": 2, "throw": 4, @@ -8045,6 +8024,8 @@ "hash": 20, "sizeof": 14, "vchSig": 18, + "[": 201, + "]": 201, "nSize": 2, "vchSig.clear": 2, "vchSig.resize": 2, @@ -8064,6 +8045,8 @@ "nBitsR": 3, "BN_num_bits": 2, "nBitsS": 3, + "<": 53, + "&&": 23, "nRecId": 4, "<4;>": 1, "keyRec": 5, @@ -8404,6 +8387,7 @@ "has": 2, "user": 2, "friendly": 2, + "description": 3, "use": 1, "mapping": 1, "dialogs.": 1, @@ -8586,6 +8570,7 @@ "SCI_CLEAR": 1, "DeleteBack": 1, "SCI_DELETEBACK": 1, + "not": 1, "at": 4, "DeleteBackNotLine": 1, "SCI_DELETEBACKNOTLINE": 1, @@ -8699,6 +8684,7 @@ "unchanged.": 1, "Valid": 1, "control": 1, + "c": 50, "Key_Down": 1, "Key_Up": 1, "Key_Left": 1, @@ -8922,6 +8908,7 @@ "ScanHtmlComment": 3, "LT": 2, "next_.literal_chars": 13, + "do": 4, "ScanString": 3, "LTE": 1, "ASSIGN_SHL": 1, @@ -8989,6 +8976,7 @@ "l": 1, "p": 5, "w": 1, + "y": 13, "keyword": 1, "Unescaped": 1, "in_character_class": 2, @@ -9630,6 +9618,7 @@ "npy_longdouble": 1, "__pyx_t_5numpy_longdouble_t": 1, "complex": 2, + "float": 7, "__pyx_t_float_complex": 27, "_Complex": 2, "real": 2, @@ -10087,6 +10076,136 @@ "<=>": 1, "other.name": 1 }, + "Clojure": { + "(": 83, + "defn": 4, + "prime": 2, + "[": 41, + "n": 9, + "]": 41, + "not": 3, + "-": 14, + "any": 1, + "zero": 1, + "map": 2, + "#": 1, + "rem": 2, + "%": 1, + ")": 84, + "range": 3, + ";": 8, + "while": 3, + "stops": 1, + "at": 1, + "the": 1, + "first": 2, + "collection": 1, + "element": 1, + "that": 1, + "evaluates": 1, + "to": 1, + "false": 2, + "like": 1, + "take": 1, + "for": 2, + "x": 6, + "html": 1, + "head": 1, + "meta": 1, + "{": 8, + "charset": 1, + "}": 8, + "link": 1, + "rel": 1, + "href": 1, + "script": 1, + "src": 1, + "body": 1, + "div.nav": 1, + "p": 1, + "into": 2, + "array": 3, + "aseq": 8, + "nil": 1, + "type": 2, + "let": 1, + "count": 3, + "a": 3, + "make": 1, + "loop": 1, + "seq": 1, + "i": 4, + "if": 1, + "<": 1, + "do": 1, + "aset": 1, + "recur": 1, + "next": 1, + "inc": 1, + "defprotocol": 1, + "ISound": 4, + "sound": 5, + "deftype": 2, + "Cat": 1, + "_": 3, + "Dog": 1, + "extend": 1, + "default": 1, + "rand": 2, + "scm*": 1, + "random": 1, + "real": 1, + "clj": 1, + "ns": 2, + "c2.svg": 2, + "use": 2, + "c2.core": 2, + "only": 4, + "unify": 2, + "c2.maths": 2, + "Pi": 2, + "Tau": 2, + "radians": 2, + "per": 2, + "degree": 2, + "sin": 2, + "cos": 2, + "mean": 2, + "cljs": 3, + "require": 1, + "c2.dom": 1, + "as": 1, + "dom": 1, + "Stub": 1, + "float": 2, + "fn": 2, + "which": 1, + "does": 1, + "exist": 1, + "on": 1, + "runtime": 1, + "def": 1, + "identity": 1, + "xy": 1, + "coordinates": 7, + "cond": 1, + "and": 1, + "vector": 1, + "y": 1, + "deftest": 1, + "function": 1, + "tests": 1, + "is": 7, + "true": 2, + "contains": 1, + "foo": 6, + "bar": 4, + "select": 1, + "keys": 2, + "baz": 4, + "vals": 1, + "filter": 1 + }, "COBOL": { "program": 1, "-": 19, @@ -12962,6 +13081,84 @@ "backdrop.fade": 1, "backdrop.fade.in": 1 }, + "Cuda": { + "__global__": 2, + "void": 3, + "scalarProdGPU": 1, + "(": 20, + "float": 8, + "*d_C": 1, + "*d_A": 1, + "*d_B": 1, + "int": 14, + "vectorN": 2, + "elementN": 3, + ")": 20, + "{": 8, + "//Accumulators": 1, + "cache": 1, + "__shared__": 1, + "accumResult": 5, + "[": 11, + "ACCUM_N": 4, + "]": 11, + ";": 30, + "////////////////////////////////////////////////////////////////////////////": 2, + "for": 5, + "vec": 5, + "blockIdx.x": 2, + "<": 5, + "+": 12, + "gridDim.x": 1, + "vectorBase": 3, + "IMUL": 1, + "vectorEnd": 2, + "////////////////////////////////////////////////////////////////////////": 4, + "iAccum": 10, + "threadIdx.x": 4, + "blockDim.x": 3, + "sum": 3, + "pos": 5, + "d_A": 2, + "*": 2, + "d_B": 2, + "}": 8, + "stride": 5, + "/": 2, + "__syncthreads": 1, + "if": 3, + "d_C": 2, + "#include": 2, + "": 1, + "": 1, + "vectorAdd": 2, + "const": 2, + "*A": 1, + "*B": 1, + "*C": 1, + "numElements": 4, + "i": 5, + "C": 1, + "A": 1, + "B": 1, + "main": 1, + "cudaError_t": 1, + "err": 5, + "cudaSuccess": 2, + "threadsPerBlock": 4, + "blocksPerGrid": 1, + "-": 1, + "<<": 1, + "": 1, + "cudaGetLastError": 1, + "fprintf": 1, + "stderr": 1, + "cudaGetErrorString": 1, + "exit": 1, + "EXIT_FAILURE": 1, + "cudaDeviceReset": 1, + "return": 1 + }, "Dart": { "class": 1, "Point": 7, @@ -13002,6 +13199,98 @@ "d472341..8ad9ffb": 1, "+": 3 }, + "DM": { + "#define": 4, + "PI": 6, + "#if": 1, + "G": 1, + "#elif": 1, + "I": 1, + "#else": 1, + "K": 1, + "#endif": 1, + "var/GlobalCounter": 1, + "var/const/CONST_VARIABLE": 1, + "var/list/MyList": 1, + "list": 3, + "(": 17, + "new": 1, + "/datum/entity": 2, + ")": 17, + "var/list/EmptyList": 1, + "[": 2, + "]": 2, + "//": 6, + "creates": 1, + "a": 1, + "of": 1, + "null": 2, + "entries": 1, + "var/list/NullList": 1, + "var/name": 1, + "var/number": 1, + "/datum/entity/proc/myFunction": 1, + "world.log": 5, + "<<": 5, + "/datum/entity/New": 1, + "number": 2, + "GlobalCounter": 1, + "+": 3, + "/datum/entity/unit": 1, + "name": 1, + "/datum/entity/unit/New": 1, + "..": 1, + "calls": 1, + "the": 2, + "parent": 1, + "s": 1, + "proc": 1, + ";": 3, + "equal": 1, + "to": 1, + "super": 1, + "and": 1, + "base": 1, + "in": 1, + "other": 1, + "languages": 1, + "rand": 1, + "/datum/entity/unit/myFunction": 1, + "/proc/ReverseList": 1, + "var/list/input": 1, + "var/list/output": 1, + "for": 1, + "var/i": 1, + "input.len": 1, + "i": 3, + "-": 2, + "IMPORTANT": 1, + "List": 1, + "Arrays": 1, + "count": 1, + "from": 1, + "output": 2, + "input": 1, + "is": 2, + "return": 3, + "/proc/DoStuff": 1, + "var/bitflag": 2, + "bitflag": 4, + "|": 1, + "/proc/DoOtherStuff": 1, + "bits": 1, + "maximum": 1, + "amount": 1, + "&": 1, + "/proc/DoNothing": 1, + "var/pi": 1, + "if": 2, + "pi": 2, + "else": 2, + "CONST_VARIABLE": 1, + "#undef": 1, + "Undefine": 1 + }, "Ecl": { "#option": 1, "(": 32, @@ -15176,6 +15465,46 @@ "": 1, "/each": 1 }, + "Idris": { + "module": 1, + "Prelude.Char": 1, + "import": 1, + "Builtins": 1, + "isUpper": 4, + "Char": 13, + "-": 8, + "Bool": 8, + "x": 36, + "&&": 3, + "<=>": 3, + "Z": 1, + "isLower": 4, + "z": 1, + "isAlpha": 3, + "||": 9, + "isDigit": 3, + "(": 8, + "9": 1, + "isAlphaNum": 2, + "isSpace": 2, + "isNL": 2, + "toUpper": 3, + "if": 2, + ")": 7, + "then": 2, + "prim__intToChar": 2, + "prim__charToInt": 2, + "else": 2, + "toLower": 2, + "+": 1, + "isHexDigit": 2, + "elem": 1, + "hexChars": 3, + "where": 1, + "List": 1, + "[": 1, + "]": 1 + }, "INI": { ";": 1, "editorconfig.org": 1, @@ -15205,6 +15534,11 @@ "SHEBANG#!ioke": 1, "println": 1 }, + "Jade": { + "p.": 1, + "Hello": 1, + "World": 1 + }, "Java": { "package": 6, "clojure.asm": 1, @@ -22324,6 +22658,29 @@ "true": 1, "return": 1 }, + "KRL": { + "ruleset": 1, + "sample": 1, + "{": 3, + "meta": 1, + "name": 1, + "description": 1, + "<<": 1, + "Hello": 1, + "world": 1, + "author": 1, + "}": 3, + "rule": 1, + "hello": 1, + "select": 1, + "when": 1, + "web": 1, + "pageview": 1, + "notify": 1, + "(": 1, + ")": 1, + ";": 1 + }, "Lasso": { "<": 7, "LassoScript": 1, @@ -34694,6 +35051,40 @@ "stay": 1, "L": 2 }, + "Protocol Buffer": { + "package": 1, + "tutorial": 1, + ";": 13, + "option": 2, + "java_package": 1, + "java_outer_classname": 1, + "message": 3, + "Person": 2, + "{": 4, + "required": 3, + "string": 3, + "name": 1, + "int32": 1, + "id": 1, + "optional": 2, + "email": 1, + "enum": 1, + "PhoneType": 2, + "MOBILE": 1, + "HOME": 2, + "WORK": 1, + "}": 4, + "PhoneNumber": 2, + "number": 1, + "type": 1, + "[": 1, + "default": 1, + "]": 1, + "repeated": 2, + "phone": 1, + "AddressBook": 1, + "person": 1 + }, "Python": { "from": 34, "__future__": 2, @@ -35972,6 +36363,193 @@ "func": 1, "print": 1 }, + "RobotFramework": { + "***": 16, + "Settings": 3, + "Documentation": 3, + "Example": 3, + "test": 6, + "cases": 2, + "using": 4, + "the": 9, + "data": 2, + "-": 16, + "driven": 4, + "testing": 2, + "approach.": 2, + "...": 28, + "Tests": 1, + "use": 2, + "Calculate": 3, + "keyword": 5, + "created": 1, + "in": 5, + "this": 1, + "file": 1, + "that": 5, + "turn": 1, + "uses": 1, + "keywords": 3, + "CalculatorLibrary": 5, + ".": 4, + "An": 1, + "exception": 1, + "is": 6, + "last": 1, + "has": 5, + "a": 4, + "custom": 1, + "_template": 1, + "keyword_.": 1, + "The": 2, + "style": 3, + "works": 3, + "well": 3, + "when": 2, + "you": 1, + "need": 3, + "to": 5, + "repeat": 1, + "same": 1, + "workflow": 3, + "multiple": 2, + "times.": 1, + "Notice": 1, + "one": 1, + "of": 3, + "these": 1, + "tests": 5, + "fails": 1, + "on": 1, + "purpose": 1, + "show": 1, + "how": 1, + "failures": 1, + "look": 1, + "like.": 1, + "Test": 4, + "Template": 2, + "Library": 3, + "Cases": 3, + "Expression": 1, + "Expected": 1, + "Addition": 2, + "+": 6, + "Subtraction": 1, + "Multiplication": 1, + "*": 4, + "Division": 2, + "/": 5, + "Failing": 1, + "Calculation": 3, + "error": 4, + "[": 4, + "]": 4, + "should": 9, + "fail": 2, + "kekkonen": 1, + "Invalid": 2, + "button": 13, + "{": 15, + "EMPTY": 3, + "}": 15, + "expression.": 1, + "by": 3, + "zero.": 1, + "Keywords": 2, + "Arguments": 2, + "expression": 5, + "expected": 4, + "Push": 16, + "buttons": 4, + "C": 4, + "Result": 8, + "be": 9, + "Should": 2, + "cause": 1, + "equal": 1, + "#": 2, + "Using": 1, + "BuiltIn": 1, + "case": 1, + "gherkin": 1, + "syntax.": 1, + "This": 3, + "similar": 1, + "examples.": 1, + "difference": 1, + "higher": 1, + "abstraction": 1, + "level": 1, + "and": 2, + "their": 1, + "arguments": 1, + "are": 1, + "embedded": 1, + "into": 1, + "names.": 1, + "kind": 2, + "_gherkin_": 2, + "syntax": 1, + "been": 3, + "made": 1, + "popular": 1, + "http": 1, + "//cukes.info": 1, + "|": 1, + "Cucumber": 1, + "It": 1, + "especially": 1, + "act": 1, + "as": 1, + "examples": 1, + "easily": 1, + "understood": 1, + "also": 2, + "business": 2, + "people.": 1, + "Given": 1, + "calculator": 1, + "cleared": 2, + "When": 1, + "user": 2, + "types": 2, + "pushes": 2, + "equals": 2, + "Then": 1, + "result": 2, + "Calculator": 1, + "User": 2, + "All": 1, + "contain": 1, + "constructed": 1, + "from": 1, + "Creating": 1, + "new": 1, + "or": 1, + "editing": 1, + "existing": 1, + "easy": 1, + "even": 1, + "for": 2, + "people": 2, + "without": 1, + "programming": 1, + "skills.": 1, + "normal": 1, + "automation.": 1, + "If": 1, + "understand": 1, + "may": 1, + "work": 1, + "better.": 1, + "Simple": 1, + "calculation": 2, + "Longer": 1, + "Clear": 1, + "built": 1, + "variable": 1 + }, "Ruby": { "load": 3, "Dir": 4, @@ -37563,6 +38141,12 @@ "[": 1, "]": 1 }, + "Scaml": { + "%": 1, + "p": 1, + "Hello": 1, + "World": 1 + }, "Scheme": { "(": 359, "import": 1, @@ -41529,15 +42113,18 @@ "Awk": 544, "Bluespec": 1298, "C": 58858, - "C++": 21480, + "C++": 21308, "Ceylon": 50, + "Clojure": 510, "COBOL": 90, "CoffeeScript": 2951, "Common Lisp": 103, "Coq": 18259, "CSS": 43867, + "Cuda": 290, "Dart": 68, "Diff": 16, + "DM": 169, "Ecl": 281, "edn": 227, "Elm": 628, @@ -41552,13 +42139,16 @@ "Groovy Server Pages": 91, "Haml": 4, "Handlebars": 69, + "Idris": 148, "INI": 27, "Ioke": 2, + "Jade": 3, "Java": 8987, "JavaScript": 76934, "JSON": 619, "Julia": 247, "Kotlin": 155, + "KRL": 25, "Lasso": 9849, "Less": 39, "LFE": 1711, @@ -41594,15 +42184,18 @@ "PowerShell": 12, "Processing": 74, "Prolog": 4040, + "Protocol Buffer": 63, "Python": 5715, "R": 175, "Racket": 360, "Ragel in Ruby Host": 593, "Rebol": 11, + "RobotFramework": 483, "Ruby": 3854, "Rust": 3566, "Sass": 56, "Scala": 420, + "Scaml": 4, "Scheme": 3478, "Scilab": 69, "SCSS": 39, @@ -41640,15 +42233,18 @@ "Awk": 1, "Bluespec": 2, "C": 26, - "C++": 20, + "C++": 19, "Ceylon": 1, + "Clojure": 7, "COBOL": 4, "CoffeeScript": 9, "Common Lisp": 1, "Coq": 12, "CSS": 2, + "Cuda": 2, "Dart": 1, "Diff": 1, + "DM": 1, "Ecl": 1, "edn": 1, "Elm": 3, @@ -41663,13 +42259,16 @@ "Groovy Server Pages": 4, "Haml": 1, "Handlebars": 2, + "Idris": 1, "INI": 2, "Ioke": 1, + "Jade": 1, "Java": 6, "JavaScript": 20, "JSON": 5, "Julia": 1, "Kotlin": 1, + "KRL": 1, "Lasso": 4, "Less": 1, "LFE": 4, @@ -41705,15 +42304,18 @@ "PowerShell": 2, "Processing": 1, "Prolog": 6, + "Protocol Buffer": 1, "Python": 7, "R": 2, "Racket": 3, "Ragel in Ruby Host": 3, "Rebol": 1, + "RobotFramework": 3, "Ruby": 16, "Rust": 1, "Sass": 2, "Scala": 3, + "Scaml": 1, "Scheme": 1, "Scilab": 3, "SCSS": 1, @@ -41741,5 +42343,5 @@ "Xtend": 2, "YAML": 1 }, - "md5": "e1daa29f986e203ade56a02091d24c99" + "md5": "558e1d930bf8fe0f633d2debeda7640b" } \ No newline at end of file From e635af4ef9813317c879024057daa6f71febf19d Mon Sep 17 00:00:00 2001 From: Kashif Rasul Date: Tue, 5 Nov 2013 22:05:12 +0100 Subject: [PATCH 3/4] Revert 94b3ea3..b301634 This rolls back to commit 94b3ea3df51edf6a7cfbd26016642e01844eb20e. --- lib/linguist/samples.json | 756 ++++---------------------------------- 1 file changed, 77 insertions(+), 679 deletions(-) diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json index f67830f0..32d17697 100644 --- a/lib/linguist/samples.json +++ b/lib/linguist/samples.json @@ -28,21 +28,13 @@ "C++": [ ".cc", ".cpp", + ".cu", ".h", ".hpp" ], "Ceylon": [ ".ceylon" ], - "Clojure": [ - ".cl2", - ".clj", - ".cljc", - ".cljs", - ".cljscm", - ".cljx", - ".hic" - ], "COBOL": [ ".cbl", ".ccp", @@ -61,19 +53,12 @@ "CSS": [ ".css" ], - "Cuda": [ - ".cu", - ".cuh" - ], "Dart": [ ".dart" ], "Diff": [ ".patch" ], - "DM": [ - ".dm" - ], "Ecl": [ ".ecl" ], @@ -126,15 +111,9 @@ ".handlebars", ".hbs" ], - "Idris": [ - ".idr" - ], "Ioke": [ ".ik" ], - "Jade": [ - ".jade" - ], "Java": [ ".java" ], @@ -153,9 +132,6 @@ "Kotlin": [ ".kt" ], - "KRL": [ - ".krl" - ], "Lasso": [ ".las", ".lasso", @@ -273,9 +249,6 @@ "Prolog": [ ".pl" ], - "Protocol Buffer": [ - ".proto" - ], "Python": [ ".py", ".script!" @@ -294,9 +267,6 @@ "Rebol": [ ".r" ], - "RobotFramework": [ - ".robot" - ], "Ruby": [ ".pluginspec", ".rabl", @@ -315,9 +285,6 @@ ".sbt", ".script!" ], - "Scaml": [ - ".scaml" - ], "Scheme": [ ".sps" ], @@ -457,8 +424,8 @@ ".gemrc" ] }, - "tokens_total": 416836, - "languages_total": 475, + "tokens_total": 415313, + "languages_total": 458, "tokens": { "ABAP": { "*/**": 1, @@ -7768,17 +7735,82 @@ "C++": { "class": 34, "Bar": 2, - "{": 550, + "{": 553, "protected": 4, "char": 122, "*name": 6, - ";": 2290, + ";": 2308, "public": 27, - "void": 150, + "void": 152, "hello": 2, - "(": 2422, - ")": 2424, - "}": 549, + "(": 2438, + ")": 2440, + "}": 552, + "foo": 2, + "cudaArray*": 1, + "cu_array": 4, + "texture": 1, + "": 1, + "2": 1, + "cudaReadModeElementType": 1, + "tex": 4, + "cudaChannelFormatDesc": 1, + "description": 5, + "cudaCreateChannelDesc": 1, + "": 1, + "cudaMallocArray": 1, + "&": 148, + "width": 5, + "height": 5, + "cudaMemcpyToArray": 1, + "image": 1, + "width*height*sizeof": 1, + "float": 9, + "cudaMemcpyHostToDevice": 1, + "tex.addressMode": 2, + "[": 204, + "]": 204, + "cudaAddressModeClamp": 2, + "tex.filterMode": 1, + "cudaFilterModePoint": 1, + "tex.normalized": 1, + "false": 43, + "//": 239, + "do": 5, + "not": 2, + "normalize": 1, + "coordinates": 1, + "cudaBindTextureToArray": 1, + "dim3": 2, + "blockDim": 2, + "gridDim": 2, + "+": 55, + "blockDim.x": 2, + "-": 227, + "/": 15, + "blockDim.y": 2, + "kernel": 2, + "<<": 19, + "<": 56, + "d_data": 1, + "cudaUnbindTexture": 1, + "//end": 1, + "__global__": 1, + "float*": 1, + "odata": 2, + "int": 148, + "unsigned": 22, + "x": 48, + "blockIdx.x*blockDim.x": 1, + "threadIdx.x": 1, + "y": 16, + "blockIdx.y*blockDim.y": 1, + "threadIdx.y": 1, + "if": 296, + "&&": 24, + "c": 52, + "tex2D": 1, + "y*width": 1, "#include": 106, "": 1, "": 1, @@ -7790,7 +7822,6 @@ "NULL": 108, "*Env": 1, "instance": 4, - "if": 295, "env_instance": 3, "new": 9, "return": 147, @@ -7805,13 +7836,11 @@ "envvar": 2, "name": 21, "value": 18, - "int": 144, "indexOfEquals": 5, "for": 18, "env": 3, "envp": 4, "*env": 1, - "+": 50, "envvar.indexOf": 1, "continue": 2, "envvar.left": 1, @@ -7828,7 +7857,6 @@ "*instance": 1, "private": 12, "#endif": 82, - "//": 238, "GDSDBREADER_H": 3, "": 1, "GDS_DIR": 1, @@ -7885,7 +7913,6 @@ "A": 1, "friend": 10, "stream": 5, - "<<": 18, "myclass.label": 2, "myclass.depth": 2, "myclass.userIndex": 2, @@ -7899,7 +7926,6 @@ "myclass.firstLineData": 4, "myclass.linesNumbers": 2, "QDataStream": 2, - "&": 146, "myclass": 1, "//Don": 1, "read": 1, @@ -7946,7 +7972,6 @@ "ECDSA_SIG_recover_key_GFp": 3, "ECDSA_SIG": 3, "*ecsig": 1, - "unsigned": 20, "*msg": 2, "msglen": 2, "recid": 3, @@ -7965,13 +7990,10 @@ "*zero": 1, "n": 28, "i": 47, - "/": 13, - "-": 225, "BN_CTX_start": 1, "order": 8, "BN_CTX_get": 8, "EC_GROUP_get_order": 1, - "x": 44, "BN_copy": 1, "BN_mul_word": 1, "BN_add": 1, @@ -8010,7 +8032,6 @@ "fCompressedPubKey": 5, "true": 39, "Reset": 5, - "false": 42, "EC_KEY_new_by_curve_name": 2, "NID_secp256k1": 2, "throw": 4, @@ -8024,8 +8045,6 @@ "hash": 20, "sizeof": 14, "vchSig": 18, - "[": 201, - "]": 201, "nSize": 2, "vchSig.clear": 2, "vchSig.resize": 2, @@ -8045,8 +8064,6 @@ "nBitsR": 3, "BN_num_bits": 2, "nBitsS": 3, - "<": 53, - "&&": 23, "nRecId": 4, "<4;>": 1, "keyRec": 5, @@ -8387,7 +8404,6 @@ "has": 2, "user": 2, "friendly": 2, - "description": 3, "use": 1, "mapping": 1, "dialogs.": 1, @@ -8570,7 +8586,6 @@ "SCI_CLEAR": 1, "DeleteBack": 1, "SCI_DELETEBACK": 1, - "not": 1, "at": 4, "DeleteBackNotLine": 1, "SCI_DELETEBACKNOTLINE": 1, @@ -8684,7 +8699,6 @@ "unchanged.": 1, "Valid": 1, "control": 1, - "c": 50, "Key_Down": 1, "Key_Up": 1, "Key_Left": 1, @@ -8908,7 +8922,6 @@ "ScanHtmlComment": 3, "LT": 2, "next_.literal_chars": 13, - "do": 4, "ScanString": 3, "LTE": 1, "ASSIGN_SHL": 1, @@ -8976,7 +8989,6 @@ "l": 1, "p": 5, "w": 1, - "y": 13, "keyword": 1, "Unescaped": 1, "in_character_class": 2, @@ -9618,7 +9630,6 @@ "npy_longdouble": 1, "__pyx_t_5numpy_longdouble_t": 1, "complex": 2, - "float": 7, "__pyx_t_float_complex": 27, "_Complex": 2, "real": 2, @@ -10076,136 +10087,6 @@ "<=>": 1, "other.name": 1 }, - "Clojure": { - "(": 83, - "defn": 4, - "prime": 2, - "[": 41, - "n": 9, - "]": 41, - "not": 3, - "-": 14, - "any": 1, - "zero": 1, - "map": 2, - "#": 1, - "rem": 2, - "%": 1, - ")": 84, - "range": 3, - ";": 8, - "while": 3, - "stops": 1, - "at": 1, - "the": 1, - "first": 2, - "collection": 1, - "element": 1, - "that": 1, - "evaluates": 1, - "to": 1, - "false": 2, - "like": 1, - "take": 1, - "for": 2, - "x": 6, - "html": 1, - "head": 1, - "meta": 1, - "{": 8, - "charset": 1, - "}": 8, - "link": 1, - "rel": 1, - "href": 1, - "script": 1, - "src": 1, - "body": 1, - "div.nav": 1, - "p": 1, - "into": 2, - "array": 3, - "aseq": 8, - "nil": 1, - "type": 2, - "let": 1, - "count": 3, - "a": 3, - "make": 1, - "loop": 1, - "seq": 1, - "i": 4, - "if": 1, - "<": 1, - "do": 1, - "aset": 1, - "recur": 1, - "next": 1, - "inc": 1, - "defprotocol": 1, - "ISound": 4, - "sound": 5, - "deftype": 2, - "Cat": 1, - "_": 3, - "Dog": 1, - "extend": 1, - "default": 1, - "rand": 2, - "scm*": 1, - "random": 1, - "real": 1, - "clj": 1, - "ns": 2, - "c2.svg": 2, - "use": 2, - "c2.core": 2, - "only": 4, - "unify": 2, - "c2.maths": 2, - "Pi": 2, - "Tau": 2, - "radians": 2, - "per": 2, - "degree": 2, - "sin": 2, - "cos": 2, - "mean": 2, - "cljs": 3, - "require": 1, - "c2.dom": 1, - "as": 1, - "dom": 1, - "Stub": 1, - "float": 2, - "fn": 2, - "which": 1, - "does": 1, - "exist": 1, - "on": 1, - "runtime": 1, - "def": 1, - "identity": 1, - "xy": 1, - "coordinates": 7, - "cond": 1, - "and": 1, - "vector": 1, - "y": 1, - "deftest": 1, - "function": 1, - "tests": 1, - "is": 7, - "true": 2, - "contains": 1, - "foo": 6, - "bar": 4, - "select": 1, - "keys": 2, - "baz": 4, - "vals": 1, - "filter": 1 - }, "COBOL": { "program": 1, "-": 19, @@ -13081,84 +12962,6 @@ "backdrop.fade": 1, "backdrop.fade.in": 1 }, - "Cuda": { - "__global__": 2, - "void": 3, - "scalarProdGPU": 1, - "(": 20, - "float": 8, - "*d_C": 1, - "*d_A": 1, - "*d_B": 1, - "int": 14, - "vectorN": 2, - "elementN": 3, - ")": 20, - "{": 8, - "//Accumulators": 1, - "cache": 1, - "__shared__": 1, - "accumResult": 5, - "[": 11, - "ACCUM_N": 4, - "]": 11, - ";": 30, - "////////////////////////////////////////////////////////////////////////////": 2, - "for": 5, - "vec": 5, - "blockIdx.x": 2, - "<": 5, - "+": 12, - "gridDim.x": 1, - "vectorBase": 3, - "IMUL": 1, - "vectorEnd": 2, - "////////////////////////////////////////////////////////////////////////": 4, - "iAccum": 10, - "threadIdx.x": 4, - "blockDim.x": 3, - "sum": 3, - "pos": 5, - "d_A": 2, - "*": 2, - "d_B": 2, - "}": 8, - "stride": 5, - "/": 2, - "__syncthreads": 1, - "if": 3, - "d_C": 2, - "#include": 2, - "": 1, - "": 1, - "vectorAdd": 2, - "const": 2, - "*A": 1, - "*B": 1, - "*C": 1, - "numElements": 4, - "i": 5, - "C": 1, - "A": 1, - "B": 1, - "main": 1, - "cudaError_t": 1, - "err": 5, - "cudaSuccess": 2, - "threadsPerBlock": 4, - "blocksPerGrid": 1, - "-": 1, - "<<": 1, - "": 1, - "cudaGetLastError": 1, - "fprintf": 1, - "stderr": 1, - "cudaGetErrorString": 1, - "exit": 1, - "EXIT_FAILURE": 1, - "cudaDeviceReset": 1, - "return": 1 - }, "Dart": { "class": 1, "Point": 7, @@ -13199,98 +13002,6 @@ "d472341..8ad9ffb": 1, "+": 3 }, - "DM": { - "#define": 4, - "PI": 6, - "#if": 1, - "G": 1, - "#elif": 1, - "I": 1, - "#else": 1, - "K": 1, - "#endif": 1, - "var/GlobalCounter": 1, - "var/const/CONST_VARIABLE": 1, - "var/list/MyList": 1, - "list": 3, - "(": 17, - "new": 1, - "/datum/entity": 2, - ")": 17, - "var/list/EmptyList": 1, - "[": 2, - "]": 2, - "//": 6, - "creates": 1, - "a": 1, - "of": 1, - "null": 2, - "entries": 1, - "var/list/NullList": 1, - "var/name": 1, - "var/number": 1, - "/datum/entity/proc/myFunction": 1, - "world.log": 5, - "<<": 5, - "/datum/entity/New": 1, - "number": 2, - "GlobalCounter": 1, - "+": 3, - "/datum/entity/unit": 1, - "name": 1, - "/datum/entity/unit/New": 1, - "..": 1, - "calls": 1, - "the": 2, - "parent": 1, - "s": 1, - "proc": 1, - ";": 3, - "equal": 1, - "to": 1, - "super": 1, - "and": 1, - "base": 1, - "in": 1, - "other": 1, - "languages": 1, - "rand": 1, - "/datum/entity/unit/myFunction": 1, - "/proc/ReverseList": 1, - "var/list/input": 1, - "var/list/output": 1, - "for": 1, - "var/i": 1, - "input.len": 1, - "i": 3, - "-": 2, - "IMPORTANT": 1, - "List": 1, - "Arrays": 1, - "count": 1, - "from": 1, - "output": 2, - "input": 1, - "is": 2, - "return": 3, - "/proc/DoStuff": 1, - "var/bitflag": 2, - "bitflag": 4, - "|": 1, - "/proc/DoOtherStuff": 1, - "bits": 1, - "maximum": 1, - "amount": 1, - "&": 1, - "/proc/DoNothing": 1, - "var/pi": 1, - "if": 2, - "pi": 2, - "else": 2, - "CONST_VARIABLE": 1, - "#undef": 1, - "Undefine": 1 - }, "Ecl": { "#option": 1, "(": 32, @@ -15465,46 +15176,6 @@ "": 1, "/each": 1 }, - "Idris": { - "module": 1, - "Prelude.Char": 1, - "import": 1, - "Builtins": 1, - "isUpper": 4, - "Char": 13, - "-": 8, - "Bool": 8, - "x": 36, - "&&": 3, - "<=>": 3, - "Z": 1, - "isLower": 4, - "z": 1, - "isAlpha": 3, - "||": 9, - "isDigit": 3, - "(": 8, - "9": 1, - "isAlphaNum": 2, - "isSpace": 2, - "isNL": 2, - "toUpper": 3, - "if": 2, - ")": 7, - "then": 2, - "prim__intToChar": 2, - "prim__charToInt": 2, - "else": 2, - "toLower": 2, - "+": 1, - "isHexDigit": 2, - "elem": 1, - "hexChars": 3, - "where": 1, - "List": 1, - "[": 1, - "]": 1 - }, "INI": { ";": 1, "editorconfig.org": 1, @@ -15534,11 +15205,6 @@ "SHEBANG#!ioke": 1, "println": 1 }, - "Jade": { - "p.": 1, - "Hello": 1, - "World": 1 - }, "Java": { "package": 6, "clojure.asm": 1, @@ -22658,29 +22324,6 @@ "true": 1, "return": 1 }, - "KRL": { - "ruleset": 1, - "sample": 1, - "{": 3, - "meta": 1, - "name": 1, - "description": 1, - "<<": 1, - "Hello": 1, - "world": 1, - "author": 1, - "}": 3, - "rule": 1, - "hello": 1, - "select": 1, - "when": 1, - "web": 1, - "pageview": 1, - "notify": 1, - "(": 1, - ")": 1, - ";": 1 - }, "Lasso": { "<": 7, "LassoScript": 1, @@ -35051,40 +34694,6 @@ "stay": 1, "L": 2 }, - "Protocol Buffer": { - "package": 1, - "tutorial": 1, - ";": 13, - "option": 2, - "java_package": 1, - "java_outer_classname": 1, - "message": 3, - "Person": 2, - "{": 4, - "required": 3, - "string": 3, - "name": 1, - "int32": 1, - "id": 1, - "optional": 2, - "email": 1, - "enum": 1, - "PhoneType": 2, - "MOBILE": 1, - "HOME": 2, - "WORK": 1, - "}": 4, - "PhoneNumber": 2, - "number": 1, - "type": 1, - "[": 1, - "default": 1, - "]": 1, - "repeated": 2, - "phone": 1, - "AddressBook": 1, - "person": 1 - }, "Python": { "from": 34, "__future__": 2, @@ -36363,193 +35972,6 @@ "func": 1, "print": 1 }, - "RobotFramework": { - "***": 16, - "Settings": 3, - "Documentation": 3, - "Example": 3, - "test": 6, - "cases": 2, - "using": 4, - "the": 9, - "data": 2, - "-": 16, - "driven": 4, - "testing": 2, - "approach.": 2, - "...": 28, - "Tests": 1, - "use": 2, - "Calculate": 3, - "keyword": 5, - "created": 1, - "in": 5, - "this": 1, - "file": 1, - "that": 5, - "turn": 1, - "uses": 1, - "keywords": 3, - "CalculatorLibrary": 5, - ".": 4, - "An": 1, - "exception": 1, - "is": 6, - "last": 1, - "has": 5, - "a": 4, - "custom": 1, - "_template": 1, - "keyword_.": 1, - "The": 2, - "style": 3, - "works": 3, - "well": 3, - "when": 2, - "you": 1, - "need": 3, - "to": 5, - "repeat": 1, - "same": 1, - "workflow": 3, - "multiple": 2, - "times.": 1, - "Notice": 1, - "one": 1, - "of": 3, - "these": 1, - "tests": 5, - "fails": 1, - "on": 1, - "purpose": 1, - "show": 1, - "how": 1, - "failures": 1, - "look": 1, - "like.": 1, - "Test": 4, - "Template": 2, - "Library": 3, - "Cases": 3, - "Expression": 1, - "Expected": 1, - "Addition": 2, - "+": 6, - "Subtraction": 1, - "Multiplication": 1, - "*": 4, - "Division": 2, - "/": 5, - "Failing": 1, - "Calculation": 3, - "error": 4, - "[": 4, - "]": 4, - "should": 9, - "fail": 2, - "kekkonen": 1, - "Invalid": 2, - "button": 13, - "{": 15, - "EMPTY": 3, - "}": 15, - "expression.": 1, - "by": 3, - "zero.": 1, - "Keywords": 2, - "Arguments": 2, - "expression": 5, - "expected": 4, - "Push": 16, - "buttons": 4, - "C": 4, - "Result": 8, - "be": 9, - "Should": 2, - "cause": 1, - "equal": 1, - "#": 2, - "Using": 1, - "BuiltIn": 1, - "case": 1, - "gherkin": 1, - "syntax.": 1, - "This": 3, - "similar": 1, - "examples.": 1, - "difference": 1, - "higher": 1, - "abstraction": 1, - "level": 1, - "and": 2, - "their": 1, - "arguments": 1, - "are": 1, - "embedded": 1, - "into": 1, - "names.": 1, - "kind": 2, - "_gherkin_": 2, - "syntax": 1, - "been": 3, - "made": 1, - "popular": 1, - "http": 1, - "//cukes.info": 1, - "|": 1, - "Cucumber": 1, - "It": 1, - "especially": 1, - "act": 1, - "as": 1, - "examples": 1, - "easily": 1, - "understood": 1, - "also": 2, - "business": 2, - "people.": 1, - "Given": 1, - "calculator": 1, - "cleared": 2, - "When": 1, - "user": 2, - "types": 2, - "pushes": 2, - "equals": 2, - "Then": 1, - "result": 2, - "Calculator": 1, - "User": 2, - "All": 1, - "contain": 1, - "constructed": 1, - "from": 1, - "Creating": 1, - "new": 1, - "or": 1, - "editing": 1, - "existing": 1, - "easy": 1, - "even": 1, - "for": 2, - "people": 2, - "without": 1, - "programming": 1, - "skills.": 1, - "normal": 1, - "automation.": 1, - "If": 1, - "understand": 1, - "may": 1, - "work": 1, - "better.": 1, - "Simple": 1, - "calculation": 2, - "Longer": 1, - "Clear": 1, - "built": 1, - "variable": 1 - }, "Ruby": { "load": 3, "Dir": 4, @@ -38141,12 +37563,6 @@ "[": 1, "]": 1 }, - "Scaml": { - "%": 1, - "p": 1, - "Hello": 1, - "World": 1 - }, "Scheme": { "(": 359, "import": 1, @@ -42113,18 +41529,15 @@ "Awk": 544, "Bluespec": 1298, "C": 58858, - "C++": 21308, + "C++": 21480, "Ceylon": 50, - "Clojure": 510, "COBOL": 90, "CoffeeScript": 2951, "Common Lisp": 103, "Coq": 18259, "CSS": 43867, - "Cuda": 290, "Dart": 68, "Diff": 16, - "DM": 169, "Ecl": 281, "edn": 227, "Elm": 628, @@ -42139,16 +41552,13 @@ "Groovy Server Pages": 91, "Haml": 4, "Handlebars": 69, - "Idris": 148, "INI": 27, "Ioke": 2, - "Jade": 3, "Java": 8987, "JavaScript": 76934, "JSON": 619, "Julia": 247, "Kotlin": 155, - "KRL": 25, "Lasso": 9849, "Less": 39, "LFE": 1711, @@ -42184,18 +41594,15 @@ "PowerShell": 12, "Processing": 74, "Prolog": 4040, - "Protocol Buffer": 63, "Python": 5715, "R": 175, "Racket": 360, "Ragel in Ruby Host": 593, "Rebol": 11, - "RobotFramework": 483, "Ruby": 3854, "Rust": 3566, "Sass": 56, "Scala": 420, - "Scaml": 4, "Scheme": 3478, "Scilab": 69, "SCSS": 39, @@ -42233,18 +41640,15 @@ "Awk": 1, "Bluespec": 2, "C": 26, - "C++": 19, + "C++": 20, "Ceylon": 1, - "Clojure": 7, "COBOL": 4, "CoffeeScript": 9, "Common Lisp": 1, "Coq": 12, "CSS": 2, - "Cuda": 2, "Dart": 1, "Diff": 1, - "DM": 1, "Ecl": 1, "edn": 1, "Elm": 3, @@ -42259,16 +41663,13 @@ "Groovy Server Pages": 4, "Haml": 1, "Handlebars": 2, - "Idris": 1, "INI": 2, "Ioke": 1, - "Jade": 1, "Java": 6, "JavaScript": 20, "JSON": 5, "Julia": 1, "Kotlin": 1, - "KRL": 1, "Lasso": 4, "Less": 1, "LFE": 4, @@ -42304,18 +41705,15 @@ "PowerShell": 2, "Processing": 1, "Prolog": 6, - "Protocol Buffer": 1, "Python": 7, "R": 2, "Racket": 3, "Ragel in Ruby Host": 3, "Rebol": 1, - "RobotFramework": 3, "Ruby": 16, "Rust": 1, "Sass": 2, "Scala": 3, - "Scaml": 1, "Scheme": 1, "Scilab": 3, "SCSS": 1, @@ -42343,5 +41741,5 @@ "Xtend": 2, "YAML": 1 }, - "md5": "558e1d930bf8fe0f633d2debeda7640b" + "md5": "e1daa29f986e203ade56a02091d24c99" } \ No newline at end of file From d86f8ba12f847bbcc69b8b06a64a0658e34a95ae Mon Sep 17 00:00:00 2001 From: Kashif Rasul Date: Tue, 5 Nov 2013 22:07:39 +0100 Subject: [PATCH 4/4] merged from master and updated samples.json --- lib/linguist/samples.json | 193 +++++++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 77 deletions(-) diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json index 4132618e..1f7c4cc4 100644 --- a/lib/linguist/samples.json +++ b/lib/linguist/samples.json @@ -31,7 +31,6 @@ "C++": [ ".cc", ".cpp", - ".cu", ".h", ".hpp" ], @@ -65,6 +64,10 @@ "CSS": [ ".css" ], + "Cuda": [ + ".cu", + ".cuh" + ], "Dart": [ ".dart" ], @@ -460,8 +463,8 @@ ".gemrc" ] }, - "tokens_total": 417572, - "languages_total": 476, + "tokens_total": 417690, + "languages_total": 477, "tokens": { "ABAP": { "*/**": 1, @@ -7829,82 +7832,17 @@ "C++": { "class": 34, "Bar": 2, - "{": 553, + "{": 550, "protected": 4, "char": 122, "*name": 6, - ";": 2308, + ";": 2290, "public": 27, - "void": 152, + "void": 150, "hello": 2, - "(": 2438, - ")": 2440, - "}": 552, - "foo": 2, - "cudaArray*": 1, - "cu_array": 4, - "texture": 1, - "": 1, - "2": 1, - "cudaReadModeElementType": 1, - "tex": 4, - "cudaChannelFormatDesc": 1, - "description": 5, - "cudaCreateChannelDesc": 1, - "": 1, - "cudaMallocArray": 1, - "&": 148, - "width": 5, - "height": 5, - "cudaMemcpyToArray": 1, - "image": 1, - "width*height*sizeof": 1, - "float": 9, - "cudaMemcpyHostToDevice": 1, - "tex.addressMode": 2, - "[": 204, - "]": 204, - "cudaAddressModeClamp": 2, - "tex.filterMode": 1, - "cudaFilterModePoint": 1, - "tex.normalized": 1, - "false": 43, - "//": 239, - "do": 5, - "not": 2, - "normalize": 1, - "coordinates": 1, - "cudaBindTextureToArray": 1, - "dim3": 2, - "blockDim": 2, - "gridDim": 2, - "+": 55, - "blockDim.x": 2, - "-": 227, - "/": 15, - "blockDim.y": 2, - "kernel": 2, - "<<": 19, - "<": 56, - "d_data": 1, - "cudaUnbindTexture": 1, - "//end": 1, - "__global__": 1, - "float*": 1, - "odata": 2, - "int": 148, - "unsigned": 22, - "x": 48, - "blockIdx.x*blockDim.x": 1, - "threadIdx.x": 1, - "y": 16, - "blockIdx.y*blockDim.y": 1, - "threadIdx.y": 1, - "if": 296, - "&&": 24, - "c": 52, - "tex2D": 1, - "y*width": 1, + "(": 2422, + ")": 2424, + "}": 549, "#include": 106, "": 1, "": 1, @@ -7916,6 +7854,7 @@ "NULL": 108, "*Env": 1, "instance": 4, + "if": 295, "env_instance": 3, "new": 9, "return": 147, @@ -7930,11 +7869,13 @@ "envvar": 2, "name": 21, "value": 18, + "int": 144, "indexOfEquals": 5, "for": 18, "env": 3, "envp": 4, "*env": 1, + "+": 50, "envvar.indexOf": 1, "continue": 2, "envvar.left": 1, @@ -7951,6 +7892,7 @@ "*instance": 1, "private": 12, "#endif": 82, + "//": 238, "GDSDBREADER_H": 3, "": 1, "GDS_DIR": 1, @@ -8007,6 +7949,7 @@ "A": 1, "friend": 10, "stream": 5, + "<<": 18, "myclass.label": 2, "myclass.depth": 2, "myclass.userIndex": 2, @@ -8020,6 +7963,7 @@ "myclass.firstLineData": 4, "myclass.linesNumbers": 2, "QDataStream": 2, + "&": 146, "myclass": 1, "//Don": 1, "read": 1, @@ -8066,6 +8010,7 @@ "ECDSA_SIG_recover_key_GFp": 3, "ECDSA_SIG": 3, "*ecsig": 1, + "unsigned": 20, "*msg": 2, "msglen": 2, "recid": 3, @@ -8084,10 +8029,13 @@ "*zero": 1, "n": 28, "i": 47, + "/": 13, + "-": 225, "BN_CTX_start": 1, "order": 8, "BN_CTX_get": 8, "EC_GROUP_get_order": 1, + "x": 44, "BN_copy": 1, "BN_mul_word": 1, "BN_add": 1, @@ -8126,6 +8074,7 @@ "fCompressedPubKey": 5, "true": 39, "Reset": 5, + "false": 42, "EC_KEY_new_by_curve_name": 2, "NID_secp256k1": 2, "throw": 4, @@ -8139,6 +8088,8 @@ "hash": 20, "sizeof": 14, "vchSig": 18, + "[": 201, + "]": 201, "nSize": 2, "vchSig.clear": 2, "vchSig.resize": 2, @@ -8158,6 +8109,8 @@ "nBitsR": 3, "BN_num_bits": 2, "nBitsS": 3, + "<": 53, + "&&": 23, "nRecId": 4, "<4;>": 1, "keyRec": 5, @@ -8498,6 +8451,7 @@ "has": 2, "user": 2, "friendly": 2, + "description": 3, "use": 1, "mapping": 1, "dialogs.": 1, @@ -8680,6 +8634,7 @@ "SCI_CLEAR": 1, "DeleteBack": 1, "SCI_DELETEBACK": 1, + "not": 1, "at": 4, "DeleteBackNotLine": 1, "SCI_DELETEBACKNOTLINE": 1, @@ -8793,6 +8748,7 @@ "unchanged.": 1, "Valid": 1, "control": 1, + "c": 50, "Key_Down": 1, "Key_Up": 1, "Key_Left": 1, @@ -9016,6 +8972,7 @@ "ScanHtmlComment": 3, "LT": 2, "next_.literal_chars": 13, + "do": 4, "ScanString": 3, "LTE": 1, "ASSIGN_SHL": 1, @@ -9083,6 +9040,7 @@ "l": 1, "p": 5, "w": 1, + "y": 13, "keyword": 1, "Unescaped": 1, "in_character_class": 2, @@ -9724,6 +9682,7 @@ "npy_longdouble": 1, "__pyx_t_5numpy_longdouble_t": 1, "complex": 2, + "float": 7, "__pyx_t_float_complex": 27, "_Complex": 2, "real": 2, @@ -13186,6 +13145,84 @@ "backdrop.fade": 1, "backdrop.fade.in": 1 }, + "Cuda": { + "__global__": 2, + "void": 3, + "scalarProdGPU": 1, + "(": 20, + "float": 8, + "*d_C": 1, + "*d_A": 1, + "*d_B": 1, + "int": 14, + "vectorN": 2, + "elementN": 3, + ")": 20, + "{": 8, + "//Accumulators": 1, + "cache": 1, + "__shared__": 1, + "accumResult": 5, + "[": 11, + "ACCUM_N": 4, + "]": 11, + ";": 30, + "////////////////////////////////////////////////////////////////////////////": 2, + "for": 5, + "vec": 5, + "blockIdx.x": 2, + "<": 5, + "+": 12, + "gridDim.x": 1, + "vectorBase": 3, + "IMUL": 1, + "vectorEnd": 2, + "////////////////////////////////////////////////////////////////////////": 4, + "iAccum": 10, + "threadIdx.x": 4, + "blockDim.x": 3, + "sum": 3, + "pos": 5, + "d_A": 2, + "*": 2, + "d_B": 2, + "}": 8, + "stride": 5, + "/": 2, + "__syncthreads": 1, + "if": 3, + "d_C": 2, + "#include": 2, + "": 1, + "": 1, + "vectorAdd": 2, + "const": 2, + "*A": 1, + "*B": 1, + "*C": 1, + "numElements": 4, + "i": 5, + "C": 1, + "A": 1, + "B": 1, + "main": 1, + "cudaError_t": 1, + "err": 5, + "cudaSuccess": 2, + "threadsPerBlock": 4, + "blocksPerGrid": 1, + "-": 1, + "<<": 1, + "": 1, + "cudaGetLastError": 1, + "fprintf": 1, + "stderr": 1, + "cudaGetErrorString": 1, + "exit": 1, + "EXIT_FAILURE": 1, + "cudaDeviceReset": 1, + "return": 1 + }, "Dart": { "class": 1, "Point": 7, @@ -42233,7 +42270,7 @@ "Awk": 544, "Bluespec": 1298, "C": 58858, - "C++": 21480, + "C++": 21308, "Ceylon": 50, "Clojure": 510, "COBOL": 90, @@ -42241,6 +42278,7 @@ "Common Lisp": 103, "Coq": 18259, "CSS": 43867, + "Cuda": 290, "Dart": 68, "Diff": 16, "DM": 169, @@ -42354,7 +42392,7 @@ "Awk": 1, "Bluespec": 2, "C": 26, - "C++": 20, + "C++": 19, "Ceylon": 1, "Clojure": 7, "COBOL": 4, @@ -42362,6 +42400,7 @@ "Common Lisp": 1, "Coq": 12, "CSS": 2, + "Cuda": 2, "Dart": 1, "Diff": 1, "DM": 1, @@ -42464,5 +42503,5 @@ "Xtend": 2, "YAML": 1 }, - "md5": "6a064f3fdb191614ff6f065a365cb3d7" + "md5": "9fdad6d44dffa2bd9b71e18d9082cb2e" } \ No newline at end of file