Skip to content

Commit afd77ed

Browse files
RunDevelopmentRunDevelopment
authored
Stan: Added missing keywords and HOFs (#3238)
1 parent 642d93e commit afd77ed

File tree

5 files changed

+179
-47
lines changed

5 files changed

+179
-47
lines changed

‎components/prism-stan.js‎

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,65 @@
1-
// https://mc-stan.org/docs/2_24/reference-manual/bnf-grammars.html
1+
(function (Prism) {
22

3-
Prism.languages.stan = {
4-
'comment': /\/\/.*|\/\*[\s\S]*?\*\/|#(?!include).*/,
5-
'string': {
6-
// String literals can contain spaces and any printable ASCII characters except for " and \
7-
// https://mc-stan.org/docs/2_24/reference-manual/print-statements-section.html#string-literals
8-
pattern: /"[\x20\x21\x23-\x5B\x5D-\x7E]*"/,
9-
greedy: true
10-
},
11-
'directive': {
12-
pattern: /^([ \t]*)#include\b.*/m,
13-
lookbehind: true,
14-
alias: 'property'
15-
},
3+
// https://mc-stan.org/docs/2_28/reference-manual/bnf-grammars.html
164

17-
'function-arg': {
18-
pattern: /(\b(?:algebra_solver|integrate_1d|integrate_ode|integrate_ode_bdf|integrate_ode_rk45|map_rect)\s*\(\s*)[a-zA-Z]\w*/,
19-
lookbehind: true,
20-
alias: 'function'
21-
},
22-
'constraint': {
23-
pattern: /(\b(?:int|matrix|real|row_vector|vector)\s*)<[^<>]*>/,
24-
lookbehind: true,
25-
inside: {
26-
'expression': {
27-
pattern: /(=\s*)\S(?:\S|\s+(?!\s))*?(?=\s*(?:>$|,\s*\w+\s*=))/,
28-
lookbehind: true,
29-
inside: null // see below
5+
var higherOrderFunctions = /\b(?:algebra_solver|algebra_solver_newton|integrate_1d|integrate_ode|integrate_ode_bdf|integrate_ode_rk45|map_rect|ode_(?:adams|bdf|ckrk|rk45)(?:_tol)?|ode_adjoint_tol_ctl|reduce_sum|reduce_sum_static)\b/;
6+
7+
Prism.languages.stan = {
8+
'comment': /\/\/.*|\/\*[\s\S]*?\*\/|#(?!include).*/,
9+
'string': {
10+
// String literals can contain spaces and any printable ASCII characters except for " and \
11+
// https://mc-stan.org/docs/2_24/reference-manual/print-statements-section.html#string-literals
12+
pattern: /"[\x20\x21\x23-\x5B\x5D-\x7E]*"/,
13+
greedy: true
14+
},
15+
'directive': {
16+
pattern: /^([ \t]*)#include\b.*/m,
17+
lookbehind: true,
18+
alias: 'property'
19+
},
20+
21+
'function-arg': {
22+
pattern: RegExp(
23+
'(' +
24+
higherOrderFunctions.source +
25+
/\s*\(\s*/.source +
26+
')' +
27+
/[a-zA-Z]\w*/.source
28+
),
29+
lookbehind: true,
30+
alias: 'function'
31+
},
32+
'constraint': {
33+
pattern: /(\b(?:int|matrix|real|row_vector|vector)\s*)<[^<>]*>/,
34+
lookbehind: true,
35+
inside: {
36+
'expression': {
37+
pattern: /(=\s*)\S(?:\S|\s+(?!\s))*?(?=\s*(?:>$|,\s*\w+\s*=))/,
38+
lookbehind: true,
39+
inside: null // see below
40+
},
41+
'property': /\b[a-z]\w*(?=\s*=)/i,
42+
'operator': /=/,
43+
'punctuation': /^<|>$|,/
44+
}
45+
},
46+
'keyword': [
47+
{
48+
pattern: /\bdata(?=\s*\{)|\b(?:functions|generated|model|parameters|quantities|transformed)\b/,
49+
alias: 'program-block'
3050
},
31-
'property': /\b[a-z]\w*(?=\s*=)/i,
32-
'operator': /=/,
33-
'punctuation': /^<|>$|,/
34-
}
35-
},
36-
'keyword': [
37-
/\b(?:break|cholesky_factor_corr|cholesky_factor_cov|continue|corr_matrix|cov_matrix|data|else|for|functions|generated|if|in|increment_log_prob|int|matrix|model|ordered|parameters|positive_ordered|print|quantities|real|reject|return|row_vector|simplex|target|transformed|unit_vector|vector|void|while)\b/,
38-
// these are functions that are known to take another function as their first argument.
39-
/\b(?:algebra_solver|integrate_1d|integrate_ode|integrate_ode_bdf|integrate_ode_rk45|map_rect)\b/
40-
],
41-
'function': /\b[a-z]\w*(?=\s*\()/i,
42-
'number': /(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:E[+-]?\d+)?\b/i,
43-
'boolean': /\b(?:false|true)\b/,
51+
/\b(?:array|break|cholesky_factor_corr|cholesky_factor_cov|complex|continue|corr_matrix|cov_matrix|data|else|for|if|in|increment_log_prob|int|matrix|ordered|positive_ordered|print|real|reject|return|row_vector|simplex|target|unit_vector|vector|void|while)\b/,
52+
// these are functions that are known to take another function as their first argument.
53+
higherOrderFunctions
54+
],
55+
'function': /\b[a-z]\w*(?=\s*\()/i,
56+
'number': /(?:\b\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\B\.\d+(?:_\d+)*)(?:E[+-]?\d+(?:_\d+)*)?i?(?!\w)/i,
57+
'boolean': /\b(?:false|true)\b/,
58+
59+
'operator': /<-|\.[*/]=?|\|\|?|&&|[!=<>+\-*/]=?|['^%~?:]/,
60+
'punctuation': /[()\[\]{},;]/
61+
};
4462

45-
'operator': /<-|\.[*/]=?|\|\|?|&&|[!=<>+\-*/]=?|['^%~?:]/,
46-
'punctuation': /[()\[\]{},;]/
47-
};
63+
Prism.languages.stan.constraint.inside.expression.inside = Prism.languages.stan;
4864

49-
Prism.languages.stan.constraint.inside.expression.inside = Prism.languages.stan;
65+
}(Prism));

‎components/prism-stan.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/languages/stan/keyword_feature.test‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
array
12
break
23
cholesky_factor_corr
34
cholesky_factor_cov
5+
complex
46
continue
57
corr_matrix
68
cov_matrix
@@ -33,18 +35,32 @@ void
3335
while
3436

3537
algebra_solver
38+
algebra_solver_newton
3639
integrate_1d
3740
integrate_ode
3841
integrate_ode_bdf
3942
integrate_ode_rk45
4043
map_rect
44+
ode_adams
45+
ode_adams_tol
46+
ode_adjoint_tol_ctl
47+
ode_bdf
48+
ode_bdf_tol
49+
ode_ckrk
50+
ode_ckrk_tol
51+
ode_rk45
52+
ode_rk45_tol
53+
reduce_sum
54+
reduce_sum_static
4155

4256
----------------------------------------------------
4357

4458
[
59+
["keyword", "array"],
4560
["keyword", "break"],
4661
["keyword", "cholesky_factor_corr"],
4762
["keyword", "cholesky_factor_cov"],
63+
["keyword", "complex"],
4864
["keyword", "continue"],
4965
["keyword", "corr_matrix"],
5066
["keyword", "cov_matrix"],
@@ -77,11 +93,23 @@ map_rect
7793
["keyword", "while"],
7894

7995
["keyword", "algebra_solver"],
96+
["keyword", "algebra_solver_newton"],
8097
["keyword", "integrate_1d"],
8198
["keyword", "integrate_ode"],
8299
["keyword", "integrate_ode_bdf"],
83100
["keyword", "integrate_ode_rk45"],
84-
["keyword", "map_rect"]
101+
["keyword", "map_rect"],
102+
["keyword", "ode_adams"],
103+
["keyword", "ode_adams_tol"],
104+
["keyword", "ode_adjoint_tol_ctl"],
105+
["keyword", "ode_bdf"],
106+
["keyword", "ode_bdf_tol"],
107+
["keyword", "ode_ckrk"],
108+
["keyword", "ode_ckrk_tol"],
109+
["keyword", "ode_rk45"],
110+
["keyword", "ode_rk45_tol"],
111+
["keyword", "reduce_sum"],
112+
["keyword", "reduce_sum_static"]
85113
]
86114

87115
----------------------------------------------------

‎tests/languages/stan/number_feature.test‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
0
22
1
33
24567898765
4+
24_56_78_98_765
45

56
0.0
67
1.0
78
3.14
89
2.7e3
910
2E-5
1011
1.23e+3
12+
3.14i
13+
40e-3i
14+
1e10i
15+
0i
16+
1_2.3_4e5_6i
1117

1218
----------------------------------------------------
1319

1420
[
1521
["number", "0"],
1622
["number", "1"],
1723
["number", "24567898765"],
24+
["number", "24_56_78_98_765"],
1825

1926
["number", "0.0"],
2027
["number", "1.0"],
2128
["number", "3.14"],
2229
["number", "2.7e3"],
2330
["number", "2E-5"],
24-
["number", "1.23e+3"]
31+
["number", "1.23e+3"],
32+
["number", "3.14i"],
33+
["number", "40e-3i"],
34+
["number", "1e10i"],
35+
["number", "0i"],
36+
["number", "1_2.3_4e5_6i"]
2537
]
2638

2739
----------------------------------------------------

‎tests/languages/stan/program-block_feature.html.test‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
functions {
2+
// ... function declarations and definitions ...
3+
}
4+
data {
5+
// ... declarations ...
6+
}
7+
transformed data {
8+
// ... declarations ... statements ...
9+
}
10+
parameters {
11+
// ... declarations ...
12+
}
13+
transformed parameters {
14+
// ... declarations ... statements ...
15+
}
16+
model {
17+
// ... declarations ... statements ...
18+
}
19+
generated quantities {
20+
// ... declarations ... statements ...
21+
}
22+
23+
// data-only quantifiers
24+
real foo(data real x) {
25+
return x^2;
26+
}
27+
28+
----------------------------------------------------
29+
30+
<span class="token keyword program-block">functions</span>
31+
<span class="token punctuation">{</span>
32+
<span class="token comment">// ... function declarations and definitions ...</span>
33+
<span class="token punctuation">}</span>
34+
<span class="token keyword program-block">data</span>
35+
<span class="token punctuation">{</span>
36+
<span class="token comment">// ... declarations ...</span>
37+
<span class="token punctuation">}</span>
38+
<span class="token keyword program-block">transformed</span>
39+
<span class="token keyword program-block">data</span>
40+
<span class="token punctuation">{</span>
41+
<span class="token comment">// ... declarations ... statements ...</span>
42+
<span class="token punctuation">}</span>
43+
<span class="token keyword program-block">parameters</span>
44+
<span class="token punctuation">{</span>
45+
<span class="token comment">// ... declarations ...</span>
46+
<span class="token punctuation">}</span>
47+
<span class="token keyword program-block">transformed</span>
48+
<span class="token keyword program-block">parameters</span>
49+
<span class="token punctuation">{</span>
50+
<span class="token comment">// ... declarations ... statements ...</span>
51+
<span class="token punctuation">}</span>
52+
<span class="token keyword program-block">model</span>
53+
<span class="token punctuation">{</span>
54+
<span class="token comment">// ... declarations ... statements ...</span>
55+
<span class="token punctuation">}</span>
56+
<span class="token keyword program-block">generated</span>
57+
<span class="token keyword program-block">quantities</span>
58+
<span class="token punctuation">{</span>
59+
<span class="token comment">// ... declarations ... statements ...</span>
60+
<span class="token punctuation">}</span>
61+
62+
<span class="token comment">// data-only quantifiers</span>
63+
<span class="token keyword">real</span>
64+
<span class="token function">foo</span>
65+
<span class="token punctuation">(</span>
66+
<span class="token keyword">data</span>
67+
<span class="token keyword">real</span>
68+
x
69+
<span class="token punctuation">)</span>
70+
<span class="token punctuation">{</span>
71+
<span class="token keyword">return</span>
72+
x
73+
<span class="token operator">^</span>
74+
<span class="token number">2</span>
75+
<span class="token punctuation">;</span>
76+
<span class="token punctuation">}</span>

0 commit comments

Comments
 (0)