Futhark: add missing tokens (#2118)

athas · web-flow · commit 323a7056a7df · 2022-04-24T14:57:53.000+02:00
Adds recognition of 'def'/'type^'/'type~' keywords and adds some
missing characters to the regexes for identifiers and punctuation.
diff --git a/pygments/lexers/futhark.py b/pygments/lexers/futhark.py
@@ -37,7 +37,8 @@ class FutharkLexer(RegexLexer):
 
     other_types = ('bool', )
 
-    reserved = ('if', 'then', 'else', 'let', 'loop', 'in', 'with', 'type',
+    reserved = ('if', 'then', 'else', 'def', 'let', 'loop', 'in', 'with',
+                'type', 'type~', 'type^',
                 'val', 'entry', 'for', 'while', 'do', 'case', 'match',
                 'include', 'import', 'module', 'open', 'local', 'assert', '_')
 
@@ -62,11 +63,11 @@ class FutharkLexer(RegexLexer):
 
             # Identifiers
             (r'#\[([a-zA-Z_\(\) ]*)\]', Comment.Preproc),
-            (r'!?(%s\.)*%s' % (identifier_re, identifier_re), Name),
+            (r'[#!]?(%s\.)*%s' % (identifier_re, identifier_re), Name),
 
             (r'\\', Operator),
             (r'[-+/%=!><|&*^][-+/%=!><|&*^.]*', Operator),
-            (r'[][(),:;`{}]', Punctuation),
+            (r'[][(),:;`{}?.\'~^]', Punctuation),
 
             #  Numbers
             (r'0[xX]_*[\da-fA-F](_*[\da-fA-F])*_*[pP][+-]?\d(_*\d)*' + num_postfix,
diff --git a/tests/examplefiles/futhark/example.fut b/tests/examplefiles/futhark/example.fut
@@ -1,16 +1,17 @@
+local let dotprod [n] 't
+                  (mul: t -> t -> t) (add: t -> t -> t) (zero: t)
+                  (a: [n]t) (b: [n]t): t =
+  map2 mul a b |> reduce add zero
+
 module matmul (F: numeric) = {
   type t = F.t
   open F
 
-  local let dotprod [n] (a: [n]t) (b: [n]t): t =
-  map2 (*) a b |> reduce (+) (i32 0)
-
-
-  let matmul [n1][n2][m] (xss: [n1][m]t) (yss: [m][n2]t): [n1][n2]t =
-    map (\xs -> map (\ys -> dotprod xs ys) <| transpose yss) xss
+  let matmul [n1][n2][m] (xss: [n1][m]t) (yss: [m][n2]t): *[n1][n2]t =
+    map (\xs -> map (\ys -> dotprod (*) (+) (i32 0) xs ys) <| transpose yss) xss
 }
 
 module matmul32 = matmul f32
 
-let main [n][m] (xss: [n][m]f32) (yss: [m][n]f32): *[n][n]f32 =
+let main [n][m] (xss: [n][m]f32) (yss: [m][n]f32): ?[a][b].[a][b]f32 =
   matmul32.matmul xss yss
diff --git a/tests/examplefiles/futhark/example.fut.output b/tests/examplefiles/futhark/example.fut.output
