Add xtlang

AUTHORS.en.txt

@@ -272,3 +272,4 @@ Contributors:
 - Antoine Boisier-Michaud <[email protected]>
 - Alejandro Isaza <[email protected]>
 - Laurent Voullemier <[email protected]>
+- Yuya Chiba <[email protected]>

CHANGES.md

@@ -2,6 +2,8 @@
 
 New languages:
 
+- *xtlang* by [Yuya Chiba][]
+
 New styles:
 
 Improvements:
@@ -22,6 +24,7 @@ Improvements:
 [Ahmed Atito]: https://github.com/atitoa93
 [Matthew Evans]: https://github.com/matthewevans
 [Tsuyusato Kitsune]: https://github.com/MakeNowJust
+[Yuya Chiba]: https://github.com/cyblue9
 
 ## Version 9.13.1
 

docs/css-classes-reference.rst

@@ -451,6 +451,8 @@ Language names and aliases
 | Vim Script              | vim                                               |
 +-------------------------+---------------------------------------------------+
 | x86 Assembly            | x86asm                                            |
++-----------------------------------------------------------------------------+
+| xtlang                  | xtlang, xtm                                       |
 +-------------------------+---------------------------------------------------+
 | XL                      | xl, tao                                           |
 +-------------------------+---------------------------------------------------+

src/languages/xtlang.js

@@ -0,0 +1,272 @@
+/*
+Language: xtlang
+Description: This is a mixture of Scheme and xtlang for the `Extempore programming environment <https://extemporelang.github.io/>`.
+Author: YUYA CHIBA <[email protected]>
+Origin: scheme.js
+Category: lisp
+*/
+
+function(hljs) {
+  var SCHEME_SIMPLE_NUMBER_RE  = '(\\-|\\+)?\\d+([./]\\d+)?';
+  var SCHEME_COMPLEX_NUMBER_RE = SCHEME_SIMPLE_NUMBER_RE + '[\\+\\-]' +
+                                 SCHEME_SIMPLE_NUMBER_RE + 'i';
+
+  // valid names for Scheme identifiers(names cannot consist fully
+  // of numbers, but this should be good enough for now)
+  var VALID_SCHEME_NAME_RE = '[\\w\\!\\$%&\\*\\+,\\/:<=>\\?@\\^~\\|\\-]+';
+
+  // valid characters in xtlang names & types
+  var VALID_XTLANG_NAME_RE = '[\\w\\.\\!\\-]+';
+  var VALID_XTLANG_TYPE_RE = '[\\w\\[\\]\\{\\}<>,\\*/\\|\\!\\-]+';
+
+  /*
+   *  Keywords based on
+   *  https://bitbucket.org/birkenfeld/pygments-main/src/7941677dc77d4f2bf0bbd6140ade85a9454b8b80/
+   *  pygments/lexers/lisp.py?at=default&fileviewer=file-view-default#lisp.py-2420
+   */
+  var COMMON_KEYWORDS_RE      = '(lambda|define|if|else|cond|and|or|' +
+                                 'let|begin|set\\!|map|for\\-each)';
+  var SCHEME_KEYWORDS_RE      = '(do|delay|quasiquote|unquote|unquote\\-splicing|' +
+                                 'eval|case|let\\*|letrec|quote)';
+  var XTLANG_BIND_KEYWORDS_RE = '(bind\\-func|bind\\-val|bind\\-lib|bind\\-type|bind\\-alias|' +
+                                 'bind\\-poly|bind\\-dylib|bind\\-lib\\-func|bind\\-lib\\-val)';
+  var XTLANG_KEYWORDS_RE      = '(letz|memzone|cast|convert|dotimes|doloop)';
+  var COMMON_FUNCTIONS_RE     = '(\\*|\\+|-|/|<|<=|=|>|>=|%|abs|acos|'         +
+                                 'angle|append|apply|asin|assoc|assq|assv|'    +
+                                 'atan|boolean\\?|caaaar|caaadr|caaar|caadar|' +
+                                 'caaddr|caadr|caar|cadaar|cadadr|cadar|'      +
+                                 'caddar|cadddr|caddr|cadr|car|cdaaar|'        +
+                                 'cdaadr|cdaar|cdadar|cdaddr|cdadr|cdar|'      +
+                                 'cddaar|cddadr|cddar|cdddar|cddddr|cdddr|'    +
+                                 'cddr|cdr|ceiling|cons|cos|floor|length|'     +
+                                 'list|log|max|member|min|modulo|not|'         +
+                                 'reverse|round|sin|sqrt|substring|tan|'       +
+                                 'println|random|null\\?|callback|now)';
+  var SCHEME_FUNCTIONS_RE     = '(call\\-with\\-current\\-continuation|'                        +
+                                 'call\\-with\\-input\\-file|call\\-with\\-output\\-file|'      +
+                                 'call\\-with\\-values|call/cc|char\\->integer|'                +
+                                 'char\\-alphabetic\\?|char\\-ci<=\\?|char\\-ci<\\?|'           +
+                                 'char\\-ci=\\?|char\\-ci>=\\?|char\\-ci>\\?|char\\-downcase|'  +
+                                 'char\\-lower\\-case\\?|char\\-numeric\\?|char\\-ready\\?|'    +
+                                 'char\\-upcase|char\\-upper\\-case\\?|char\\-whitespace\\?|'   +
+                                 'char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|'      +
+                                 'close\\-input\\-port|close\\-output\\-port|complex\\?|'       +
+                                 'current\\-input\\-port|current\\-output\\-port|denominator|'  +
+                                 'display|dynamic\\-wind|eof\\-object\\?|eq\\?|equal\\?|'       +
+                                 'eqv\\?|even\\?|exact\\->inexact|exact\\?|exp|expt|'           +
+                                 'force|gcd|imag\\-part|inexact\\->exact|inexact\\?|'           +
+                                 'input\\-port\\?|integer\\->char|integer\\?|'                  +
+                                 'interaction\\-environment|lcm|list\\->string|'                +
+                                 'list\\->vector|list\\-ref|list\\-tail|list\\?|load|'          +
+                                 'magnitude|make\\-polar|make\\-rectangular|make\\-string|'     +
+                                 'make\\-vector|memq|memv|negative\\?|newline|'                 +
+                                 'null\\-environment|number\\->string|number\\?|'               +
+                                 'numerator|odd\\?|open\\-input\\-file|open\\-output\\-file|'   +
+                                 'output\\-port\\?|pair\\?|peek\\-char|port\\?|positive\\?|'    +
+                                 'procedure\\?|quotient|rational\\?|rationalize|read|'          +
+                                 'read\\-char|real\\-part|real\\?|'                             +
+                                 'remainder|scheme\\-report\\-environment|set\\-car\\!|'        +
+                                 'set\\-cdr\\!|string|string\\->list|string\\->number|'         +
+                                 'string\\->symbol|string\\-append|string\\-ci<=\\?|'           +
+                                 'string\\-ci<\\?|string\\-ci=\\?|string\\-ci>=\\?|'            +
+                                 'string\\-ci>\\?|string\\-copy|string\\-fill\\!|'              +
+                                 'string\\-length|string\\-ref|string\\-set\\!|string<=\\?|'    +
+                                 'string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|'      +
+                                 'symbol\\->string|symbol\\?|transcript\\-off|transcript\\-on|' +
+                                 'truncate|values|vector|vector\\->list|vector\\-fill\\!|'      +
+                                 'vector\\-length|vector\\?|'                                   +
+                                 'with\\-input\\-from\\-file|with\\-output\\-to\\-file|write|'  +
+                                 'write\\-char|zero\\?)';
+  var XTLANG_FUNCTIONS_RE     = '(toString|afill\\!|pfill\\!|tfill\\!|tbind|vfill\\!|'           +
+                                 'array\\-fill\\!|pointer\\-fill\\!|tuple\\-fill\\!|'            +
+                                 'vector\\-fill\\!|free|array|tuple|~|cset\\!|cref|&|bor|'       +
+                                 'ang\\-names|<<|>>|nil|printf|sprintf|null|now|'                +
+                                 'pset\\!|pref\\-ptr|vset\\!|vref|aset\\!|aref|aref\\-ptr|'      +
+                                 'tset\\!|tref|tref\\-ptr|salloc|halloc|zalloc|alloc|'           +
+                                 'schedule|exp|log|sin|cos|tan|asin|acos|atan|'                  +
+                                 'sqrt|expt|floor|ceiling|truncate|round|'                       +
+                                 'llvm_printf|push_zone|pop_zone|memzone|callback|'              +
+                                 'llvm_sprintf|make\\-array|array\\-set\\!|array\\-ref|'         +
+                                 'array\\-ref\\-ptr|pointer\\-set\\!|pointer\\-ref|'             +
+                                 'pointer\\-ref\\-ptr|stack\\-alloc|heap\\-alloc|zone\\-alloc|'  +
+                                 'make\\-tuple|tuple\\-set\\!|tuple\\-ref|tuple\\-ref\\-ptr|'    +
+                                 'closure\\-set\\!|closure\\-ref|pref|pdref|impc_null|bitcast|'  +
+                                 'void|ifret|ret\\->|clrun\\->|make\\-env\\-zone|make\\-env|<>|' +
+                                 'dtof|ftod|i1tof|i1tod|i1toi8|i1toi32|i1toi64|i8tof|i8tod|'     +
+                                 'i8toi1|i8toi32|i8toi64|i32tof|i32tod|i32toi1|'                 +
+                                 'i32toi8|i32toi64|i64tof|i64tod|i64toi1|'                       +
+                                 'i64toi8|i64toi32)';
+
+  var SHEBANG = {
+    className: 'meta',
+    begin: '^#!',
+    end: '$'
+  };
+
+  var LITERAL = {
+    className: 'literal',
+    begin: '(#t|#f)'
+  };
+
+  var XTLANG_TYPE = {
+    className: 'type',
+    lexemes: VALID_XTLANG_TYPE_RE,
+    variants: [
+      { begin: ':' + VALID_XTLANG_TYPE_RE },
+      { begin: '(<' + VALID_XTLANG_TYPE_RE + '>|\\|' + VALID_XTLANG_TYPE_RE + '\\||/' +
+               VALID_XTLANG_TYPE_RE + '/|' + VALID_XTLANG_TYPE_RE + '\\*)\\**' }
+    ],
+  };
+
+  var NUMBER = {
+    className: 'number',
+    variants: [
+      { begin: SCHEME_SIMPLE_NUMBER_RE, relevance: 0 },
+      { begin: SCHEME_COMPLEX_NUMBER_RE, relevance: 0 },
+      { begin: '#b[0-1]+(/[0-1]+)?' },
+      { begin: '#o[0-7]+(/[0-7]+)?' },
+      { begin: '#x[0-9a-f]+(/[0-9a-f]+)?' }
+    ]
+  };
+
+  var STRING = {
+    className: 'string',
+    variants: [
+      { begin: '"', end:'"'},
+      { begin: '(#\\\\' + VALID_SCHEME_NAME_RE + '|#\\\\.)' }
+    ],
+    contains: [
+      {
+        className: 'doctag', begin: '@\\w+', lexemes: VALID_XTLANG_NAME_RE
+      }
+    ]
+  };
+
+  var COMMENT = [
+    hljs.COMMENT(
+      ';',
+      '$',
+      {
+        relevance: 0
+      }
+    ),
+    hljs.COMMENT('#\\|', '\\|#')
+  ];
+
+  var IDENT = {
+    className: 'variable',
+    begin: VALID_XTLANG_NAME_RE,
+    relevance: 0
+  };
+
+  var QUOTED_IDENT = {
+    className: 'symbol',
+    begin: '\'' + VALID_SCHEME_NAME_RE
+  };
+
+  var SPECIAL_OPERATORS = {
+    className: 'symbol',
+    begin: '(\'|#|`|,@|,|\\.)'
+  };
+
+  var QUOTED_LIST = {
+    variants: [
+      { begin: /'/ },
+      { begin: '`' }
+    ],
+    contains: [
+      {
+        begin: '\\(', end: '\\)',
+        contains: ['self', LITERAL, STRING, NUMBER, IDENT, QUOTED_IDENT, SPECIAL_OPERATORS]
+      }
+    ]
+  };
+
+  var COMMON_KEYWORDS = {
+    className: 'keyword',
+    begin: COMMON_KEYWORDS_RE,
+    lexemes: VALID_SCHEME_NAME_RE
+  };
+
+  var SCHEME_KEYWORDS = {
+    className: 'keyword',
+    begin: SCHEME_KEYWORDS_RE,
+    lexemes: VALID_SCHEME_NAME_RE
+  }
+
+  var XTLANG_KEYWORDS = {
+    className: 'keyword',
+    begin: XTLANG_KEYWORDS_RE,
+    lexemes: VALID_XTLANG_NAME_RE
+  };
+
+  var COMMON_FUNCTIONS = {
+    className: 'funciton',
+    begin: COMMON_FUNCTIONS_RE,
+    lexemes: VALID_SCHEME_NAME_RE
+  };
+
+  var SCHEME_FUNCTIONS = {
+    className: 'funciton',
+    begin: SCHEME_FUNCTIONS_RE,
+    lexemes: VALID_SCHEME_NAME_RE,
+  };
+
+  var XTLANG_FUNCTIONS = {
+    className: 'funciton',
+    begin: XTLANG_FUNCTIONS_RE,
+    lexemes: VALID_XTLANG_NAME_RE,
+  };
+
+  var DEFINE = {
+    className: 'keyword',
+    lexemes: VALID_SCHEME_NAME_RE,
+    end: '$',
+    variants : [
+      { begin: XTLANG_BIND_KEYWORDS_RE },
+      { begin: 'define' }
+    ],
+    contains: [
+      hljs.inherit(hljs.TITLE_MODE, { begin: VALID_SCHEME_NAME_RE, endsParent: true })
+    ]
+  };
+
+  var XTLANG = {
+    lexemes: VALID_SCHEME_NAME_RE,
+    variants: [
+      XTLANG_KEYWORDS, XTLANG_FUNCTIONS,
+    ]
+  };
+
+  var SCHEME = {
+    lexemes: VALID_SCHEME_NAME_RE,
+    variants: [
+      SCHEME_KEYWORDS, SCHEME_FUNCTIONS
+    ]
+  };
+
+  var COMMON = {
+    endsWithParent: true,
+    relevance: 0
+  };
+
+  var LIST = {
+    variants: [
+      { begin: '\\(', end: '\\)' },
+      { begin: '\\[', end: '\\]' }
+    ],
+    contains: [DEFINE, XTLANG, SCHEME, COMMON]
+  };
+
+  COMMON.contains = [LITERAL, NUMBER, XTLANG_TYPE, STRING, QUOTED_IDENT,
+                     SPECIAL_OPERATORS, QUOTED_LIST, COMMON_KEYWORDS,
+                     COMMON_FUNCTIONS, IDENT, LIST].concat(COMMENT);
+
+  return {
+    aliases: ['xtm'],
+    illegal: /\S/,
+    contains: [
+      SHEBANG, NUMBER, STRING, QUOTED_IDENT, SPECIAL_OPERATORS, QUOTED_LIST, LIST
+    ].concat(COMMENT)
+  };
+}

test/detect/xtlang/default.txt

@@ -0,0 +1,12 @@
+(bind-func xtlang_closure
+  "This is docstrings!
+
+@param - the first number to multiply
+@param - the second number to multiply
+@return - the multiplication of the two input arguments" 
+  (lambda (c:double d:i64)
+    (let ((result (* c (i64tod d))))
+      (printf "result = %f\n" result)
+      result)))
+
+(xtlang_closure 4.5 2) ;; prints "result = 9.000000", returns 9.0

test/markup/xtlang/scheme.expect.txt

@@ -0,0 +1,8 @@
+(<span class="hljs-keyword">define <span class="hljs-title">scheme-closure</span></span>
+  (<span class="hljs-keyword">lambda</span> (<span class="hljs-variable">a</span> <span class="hljs-variable">b</span>)
+    (<span class="hljs-keyword">let</span> ((<span class="hljs-variable">result</span> (<span class="hljs-funciton">*</span> <span class="hljs-variable">a</span> <span class="hljs-variable">b</span>)))
+      (<span class="hljs-variable">print</span> <span class="hljs-string">"result = "</span> <span class="hljs-variable">result</span>)
+      <span class="hljs-variable">result</span>)))
+
+(<span class="hljs-variable">scheme-closure</span> <span class="hljs-number">4</span> <span class="hljs-number">5</span>) <span class="hljs-comment">;; prints "result = 20", returns 20</span>
+(<span class="hljs-variable">scheme-closure</span> <span class="hljs-number">2.4</span> <span class="hljs-number">2</span>) <span class="hljs-comment">;; prints "result = 4.8", returns 4.8</span>

test/markup/xtlang/scheme.txt

@@ -0,0 +1,8 @@
+(define scheme-closure
+  (lambda (a b)
+    (let ((result (* a b)))
+      (print "result = " result)
+      result)))
+
+(scheme-closure 4 5) ;; prints "result = 20", returns 20
+(scheme-closure 2.4 2) ;; prints "result = 4.8", returns 4.8

test/markup/xtlang/xtlang.expect.txt

@@ -0,0 +1,7 @@
+(<span class="hljs-keyword">bind-func <span class="hljs-title">xtlang_closure</span></span>
+  (<span class="hljs-keyword">lambda</span> (<span class="hljs-variable">c</span><span class="hljs-type">:double</span> <span class="hljs-variable">d</span><span class="hljs-type">:i64</span>)
+    (<span class="hljs-keyword">let</span> ((<span class="hljs-variable">result</span> (<span class="hljs-funciton">*</span> <span class="hljs-variable">c</span> (<span class="hljs-funciton">i64tod</span> <span class="hljs-variable">d</span>))))
+      (<span class="hljs-funciton">printf</span> <span class="hljs-string">"result = %f\n"</span> <span class="hljs-variable">result</span>)
+      <span class="hljs-variable">result</span>)))
+
+(<span class="hljs-variable">xtlang_closure</span> <span class="hljs-number">4.5</span> <span class="hljs-number">2</span>) <span class="hljs-comment">;; prints "result = 9.000000", returns 9.0</span>

test/markup/xtlang/xtlang.txt

@@ -0,0 +1,7 @@
+(bind-func xtlang_closure
+  (lambda (c:double d:i64)
+    (let ((result (* c (i64tod d))))
+      (printf "result = %f\n" result)
+      result)))
+
+(xtlang_closure 4.5 2) ;; prints "result = 9.000000", returns 9.0