Merge branch 'master' into cpp_heuristic

Conflicts:
	lib/linguist/samples.json

github-linguist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'github-linguist'
-  s.version = '2.10.6'
+  s.version = '2.10.7'
   s.summary = "GitHub Language detection"
 
   s.authors  = "GitHub"

lib/linguist/heuristics.rb

@@ -1,6 +1,8 @@
 module Linguist
   # A collection of simple heuristics that can be used to better analyze languages.
   class Heuristics
+    ACTIVE = false
+
     # Public: Given an array of String language names,
     # apply heuristics against the given data and return an array
     # of matching languages, or nil.
@@ -10,8 +12,10 @@ module Linguist
     #
     # Returns an array of Languages or []
     def self.find_by_heuristics(data, languages)
-      if languages.all? { |l| ["Objective-C", "C++"].include?(l) }
+      if active?
-        disambiguate_h(data, languages)
+        if languages.all? { |l| ["Objective-C", "C++"].include?(l) }
+          disambiguate_h(data, languages)
+        end
       end
     end
 
@@ -26,5 +30,9 @@ module Linguist
       matches << Language["C++"] if data.include?("#include <cstdint>")
       matches
     end
+
+    def self.active?
+      !!ACTIVE
+    end
   end
 end

lib/linguist/languages.yml

@@ -90,6 +90,8 @@ AppleScript:
   aliases:
   - osascript
   primary_extension: .applescript
+  extensions:
+  - .scpt
 
 Arc:
   type: programming

samples/C++/Types.h

@@ -0,0 +1,32 @@
+/*****************************************************************************
+* Dwarf Mine - The 13-11 Benchmark
+*
+* Copyright (c) 2013 Bünger, Thomas; Kieschnick, Christian; Kusber,
+* Michael; Lohse, Henning; Wuttke, Nikolai; Xylander, Oliver; Yao, Gary;
+* Zimmermann, Florian
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*****************************************************************************/
+
+#pragma once
+
+#include <cstdint>
+
+typedef uint32_t smallPrime_t;

samples/C++/rpc.h

@@ -0,0 +1,26 @@
+// Copyright (C) 2013 Simon Que
+//
+// This file is part of DuinoCube.
+//
+// DuinoCube is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// DuinoCube is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with DuinoCube.  If not, see <http://www.gnu.org/licenses/>.
+
+// DuinoCube remote procedure call functions.
+
+#include <stdint.h>
+
+// Initializes RPC system.
+void rpc_init();
+
+// Runs the RPC server loop forever.
+void rpc_server_loop();

samples/Oxygene/Program.pas

@@ -1,125 +0,0 @@
-namespace Loops;
-
-interface
-
-uses System.Linq;
-
-type
-  ConsoleApp = class
-  public
-    class method Main;
-    method loopsTesting;
-    method fillData : sequence of Country;
-  var 
-    Countries : sequence of Country;
-  end;
-
-type 
-  Country = public class
-  public
-    property Name : String;
-    property Capital : String;
-
-    constructor (setName : String; setCapital : String);
-  end;
-implementation
-
-class method ConsoleApp.Main;
-begin
-  Console.WriteLine('Loops example');
-  Console.WriteLine();
-
-  with myConsoleApp := new ConsoleApp() do
-     myConsoleApp.loopsTesting;
-end;
-
-method ConsoleApp.loopsTesting;
-begin
-  {---------------------------------}
-  {"for" loop, taking every 5th item}
-  for i : Int32 :=0 to 50 step 5 do 
-  begin
-    Console.Write(i); Console.Write(' ');
-  end;
-
-  Console.WriteLine(); Console.WriteLine();
-
-  {---------------------------------}
-  {"for" loop, going from high to low value}
-  for i : Int32 := 10 downto 1 do
-  begin
-    Console.Write(i); Console.Write(' ');
-  end;
-
-  Console.WriteLine(); Console.WriteLine();
-
-  Countries := fillData;
-  
-  {---------------------------------}
-  {loop with defined "index" variable, which will count from 0 through the number of elements looped}
-  Console.WriteLine('Countries: ');
-  for each c in Countries index num do 
-    Console.WriteLine(Convert.ToString(num + 1) + ') ' + c.Name);
-
-  Console.WriteLine();
-
-  Console.WriteLine('Cities: ');
-  var ind : Integer :=0;
-
-  {---------------------------------}
-  {simple "loop" construct that loops endlessly, until broken out of}
-  loop
-  begin
-    Console.WriteLine(Countries.ElementAt(ind).Capital);
-    Inc(ind);
-    if ind = Countries.Count then break;
-  end;
-
-  Console.WriteLine();
-
-  {---------------------------------}
-  {the type of 'c' is inferred automatically}
-  for each c in Countries do
-    Console.WriteLine(c.Capital + ' is the capital of ' + c.Name);
-
-  Console.WriteLine();
-
-  ind := 0;
-  Console.WriteLine('Cities: ');
-
-  {"repeat ... until" loop}
-  repeat 
-    Console.WriteLine(Countries.ElementAt(ind).Capital);
-    Inc(ind);
-  until ind = Countries.Count;
-
-  Console.WriteLine();
-
-  ind := 0;
-  Console.WriteLine('Countries: ');
-
-  {---------------------------------}
-  {"while ... do" loop}
-  while ind < Countries.Count do
-  begin
-    Console.WriteLine(Countries.ElementAt(ind).Name);
-    Inc(ind);
-  end;
-
-  Console.ReadLine();
-end;
-
-method ConsoleApp.fillData: sequence of Country;
-begin
-  result := [new Country('UK', 'London'), new Country('USA', 'Washington'), new Country('Germany', 'Berlin'), 
-             new Country('Ukraine', 'Kyiv'), new Country('Russia', 'Moscow'), new Country('France', 'Paris')];
-             
-end;
-
-constructor Country (setName :String; setCapital: String);
-begin
-  Name := setName;
-  Capital := setCapital;
-end;
-
-end.

test/test_heuristics.rb

@@ -23,7 +23,7 @@ class TestHeuristcs < Test::Unit::TestCase
   def test_obj_c_by_heuristics
     languages = ["C++", "Objective-C"]
     all_h_fixtures("Objective-C").each do |fixture|
-      results = Heuristics.find_by_heuristics(fixture("Objective-C/#{File.basename(fixture)}"), languages)
+      results = Heuristics.disambiguate_h(fixture("Objective-C/#{File.basename(fixture)}"), languages)
       assert_equal Language["Objective-C"], results.first
     end
   end