From 4c81c0d90472cfe675fa39d72570a82b9cdfe3ab Mon Sep 17 00:00:00 2001
From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Mon, 13 Jul 2015 14:29:02 +0200
Subject: [PATCH] add grammar for xbase and harbour languages

---
 .gitmodules                    |   3 +
 grammars.yml                   |   2 +
 lib/linguist/languages.yml     |   5 +-
 samples/xBase/sample.prg       | 167 +++++++++++++++++++++++++++++++++
 vendor/grammars/language-xbase |   1 +
 5 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100644 samples/xBase/sample.prg
 create mode 160000 vendor/grammars/language-xbase

diff --git a/.gitmodules b/.gitmodules
index 01efd1c7..5d838196 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -656,3 +656,6 @@
 [submodule "vendor/grammars/language-crystal"]
 	path = vendor/grammars/language-crystal
 	url = https://github.com/k2b6s9j/language-crystal
+[submodule "vendor/grammars/language-xbase"]
+	path = vendor/grammars/language-xbase
+	url = https://github.com/hernad/atom-language-harbour
diff --git a/grammars.yml b/grammars.yml
index 9eb3c8c2..412b6eb7 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -338,6 +338,8 @@ vendor/grammars/language-python:
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
+vendor/grammars/language-xbase:
+- source.harbour
 vendor/grammars/language-yaml:
 - source.yaml
 vendor/grammars/latex.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 03a6c6df..de87df92 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1349,7 +1349,7 @@ Harbour:
   color: "#0e60e3"
   extensions:
   - .hb
-  tm_scope: none
+  tm_scope: source.harbour
   ace_mode: text
 
 Haskell:
@@ -3783,5 +3783,6 @@ xBase:
   color: "#403a40"
   extensions:
   - .prg
-  tm_scope: none
+  - .ch
+  tm_scope: source.harbour
   ace_mode: text
diff --git a/samples/xBase/sample.prg b/samples/xBase/sample.prg
new file mode 100644
index 00000000..33d7a1e6
--- /dev/null
+++ b/samples/xBase/sample.prg
@@ -0,0 +1,167 @@
+#require "hbtest"
+
+#pragma linenumber=on
+
+#include "hbclass.ch"
+
+#stdout "stdout"
+#warning "warning"
+
+#define MYCONST  100
+#undef MYCONST
+
+#ifdef __HARBOUR__
+#else
+#endif
+
+#if defined( __HARBOUR__ ) .OR. .T.
+#elif defined( __HARBOUR__ )
+#endif
+
+THREAD STATIC t_var := "thread"
+
+REQUEST AllTrim
+ANNOUNCE my_module
+
+PROCEDURE Main()
+
+   MEMVAR p_var, m_var
+   FIELD fld
+
+   STATIC s_test := "static"
+   LOCAL o := TTest():New( "one", "two" ), tmp
+   LOCAL oError
+   LOCAL bBlock := {| tmp | QOut( tmp ) }
+   LOCAL hHash := { "name" => "value", "name2" => "value2", 2 => 1 }
+   PUBLIC p_var := "public"
+   PRIVATE m_var := "private"
+   PARAMETERS p1
+
+   Set( _SET_DATEFORMAT, "yyyy-mm-dd" )
+
+   CLS
+   @ 10, 10 SAY "Hello world!"
+
+   ? hb_ValToExp( o )
+   ? m->p1
+   ? hHash[ "name" ], hHash[ 2 ]
+
+   FOR tmp := 1 TO 10 STEP 2
+      ? tmp
+   NEXT
+
+   FOR EACH tmp IN { "a", "b" } DESCEND
+      ? tmp
+   NEXT
+
+   ? 10.01 + 2 - 3 / 4 * 5 ^ 6 ** 1
+   ? 2 < 1, 2 > 1, 2 >= 1, 2 <= 1, 2 == 1, 2 = 1, 2 != 1, 2 <> 1, 2 # 1
+   ? -( 1 + 2 ), "a" $ "ab", 10 % 2
+
+   tmp := 0
+   DO WHILE tmp < 2
+      ? tmp++
+   ENDDO
+
+   tmp := 0
+   WHILE tmp < 2
+      ? ++tmp
+      IF tmp >= 0xFF
+         LOOP
+      ENDIF
+      EXIT
+   ENDDO
+
+   --tmp
+   tmp--
+
+   IF tmp < -10.0
+      ? NIL
+   ELSEIF .F.
+      ? 0d19800101
+   ELSE
+      ? "string"
+   ENDIF
+
+   DO CASE
+   CASE tmp == 1
+      ? "A"
+   OTHERWISE
+      ? "B"
+   ENDCASE
+
+   SWITCH tmp
+   CASE 1
+      ? "A"
+      EXIT
+   OTHERWISE
+      ? "B"
+   ENDSWITCH
+
+   BEGIN SEQUENCE WITH __BreakBlock()
+      BREAK
+   RECOVER USING oError
+   END /* SEQUENCE */
+
+   local_func( @hHash )
+
+   RETURN
+
+INIT PROCEDURE init_proc()
+   RETURN
+
+EXIT PROCEDURE exit_proc()
+   RETURN
+
+PROCEDURE returning_nothing()
+   RETURN
+
+FUNCTION pub_func()
+   RETURN .T.
+
+STATIC FUNCTION local_func()
+   RETURN .F.
+
+CREATE CLASS TTest INHERIT TParent
+   VAR One, Two
+   METHOD New( One )
+   METHOD Test() INLINE QOut( "Hello" )
+   METHOD MethProc()
+ENDCLASS
+
+METHOD PROCEDURE MethProc()
+   RETURN
+
+METHOD New( One ) CLASS TTest
+
+   ::super:New()
+   ::One := One
+
+   RETURN Self
+
+CREATE CLASS TParent
+   VAR One
+   METHOD New()
+ENDCLASS
+
+METHOD New() CLASS TParent
+   ? "TParent:New()"
+   RETURN Self
+
+// This is a comment
+/* This is a comment */
+/* This is
+a comment */
+* This is a comment
+&& This is a comment
+NOTE This is a comment
+note This is a comment
+NOTE
+
+FUNCTION pub_func2()
+   ? "hello world!"
+   ? 'hello world!'
+   ? "hello\world!"
+   ? "\"
+   ? "hello world!"
+   RETURN .T.
diff --git a/vendor/grammars/language-xbase b/vendor/grammars/language-xbase
new file mode 160000
index 00000000..86f0c6c3
--- /dev/null
+++ b/vendor/grammars/language-xbase
@@ -0,0 +1 @@
+Subproject commit 86f0c6c370c56c95d1b1ac9f3dbdca3b31d482bb