Skip to content

Commit ffad269

Browse files
Roman-ManevichRoman-Manevich
authored
Merge pull request #1769 from herd/asl-reference-copyright-and-fixes
ASL Reference copyright and fixes
2 parents 8170ef3 + 5d9ff1f commit ffad269

File tree

7 files changed

+11
-53
lines changed

7 files changed

+11
-53
lines changed

‎asllib/aslspec/tests.t/hello.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
\newcommand\A[0]{ \hyperlink{type-A}{\textsf{A}} } % Generated from A
1010
\newcommand\B[0]{ \hyperlink{type-B}{\textsf{B}} } % Generated from B
11-
\newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
11+
\newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
1212
\newcommand\s[0]{ \hyperlink{type-s}{\textsf{s}} } % Generated from s
1313
\newcommand\t[0]{ \hyperlink{type-t}{\textsf{t}} } % Generated from t
1414

1515
% -------------------
1616
% Macros for elements
1717
% -------------------
1818

19-
\DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
19+
\DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
2020

2121
\DefineConstant{empty_set}{\texthypertarget{constant-emptyset}$\emptyset$} % EndDefineConstant
2222

‎asllib/aslspec/tests.t/operators.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
\newcommand\Bool[0]{ \hyperlink{type-Bool}{\textsf{Bool}} } % Generated from Bool
1010
\newcommand\N[0]{ \hyperlink{type-N}{\textsf{N}} } % Generated from N
11-
\newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
1211
\newcommand\f[0]{ \hyperlink{relation-f}{\textit{f}} } % Generated from f
12+
\newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
1313

1414
% -------------------
1515
% Macros for elements
1616
% -------------------
1717

18-
\DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
18+
\DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
1919

2020
\DefineConstant{empty_set}{\texthypertarget{constant-emptyset}$\emptyset$} % EndDefineConstant
2121

‎asllib/aslspec/tests.t/relations.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
% ------------------
88

99
\newcommand\Int[0]{ \hyperlink{ast-Int}{\textsc{Int}} } % Generated from Int
10-
\newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
1110
\newcommand\Num[0]{ \hyperlink{type-Num}{\textsf{Num}} } % Generated from Num
1211
\newcommand\Number[0]{ \hyperlink{ast-Number}{\textsc{Number}} } % Generated from Number
1312
\newcommand\Plus[0]{ \hyperlink{ast-Plus}{\textsc{Plus}} } % Generated from Plus
@@ -16,14 +15,15 @@
1615
\newcommand\annotateplus[0]{ \hyperlink{relation-annotateplus}{\textit{annotate\_plus}} } % Generated from annotate_plus
1716
\newcommand\evalplus[0]{ \hyperlink{relation-evalplus}{\textit{eval\_plus}} } % Generated from eval_plus
1817
\newcommand\expr[0]{ \hyperlink{ast-expr}{\textsf{expr}} } % Generated from expr
18+
\newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
1919
\newcommand\type[0]{ \hyperlink{ast-type}{\textsf{type}} } % Generated from type
2020
\newcommand\typeerror[0]{ \hyperlink{type-typeerror}{\textsf{type\_error}} } % Generated from type_error
2121

2222
% -------------------
2323
% Macros for elements
2424
% -------------------
2525

26-
\DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
26+
\DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
2727

2828
\DefineConstant{empty_set}{\texthypertarget{constant-emptyset}$\emptyset$} % EndDefineConstant
2929

‎asllib/aslspec/tests.t/rule.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
% Macros for symbols
77
% ------------------
88

9-
\newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
109
\newcommand\Num[0]{ \hyperlink{type-Num}{\textsf{Num}} } % Generated from Num
1110
\newcommand\FIELDf[0]{ \hyperlink{recordfield-f}{\textsf{f}} } % Generated from f
1211
\newcommand\FIELDg[0]{ \hyperlink{recordfield-g}{\textsf{g}} } % Generated from g
12+
\newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
1313
\newcommand\r[0]{ \hyperlink{relation-r}{\textit{r}} } % Generated from r
1414
\newcommand\rec[0]{ \hyperlink{type-rec}{\textsf{rec}} } % Generated from rec
1515

1616
% -------------------
1717
% Macros for elements
1818
% -------------------
1919

20-
\DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
20+
\DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
2121

2222
\DefineConstant{empty_set}{\texthypertarget{constant-emptyset}$\emptyset$} % EndDefineConstant
2323

‎asllib/aslspec/tests.t/run.t‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,12 @@
11
# Basic tests
22
$ aslspec hello.spec --render; diff -w generated_macros.tex hello.expected; rm -f generated_macros.tex
33
Generated LaTeX macros into generated_macros.tex
4-
11c11
5-
< \newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
6-
---
7-
> \newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
8-
19c19
9-
< \DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
10-
---
11-
> \DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
12-
$ aslspec typedefs.spec --render; diff -w generated_macros.tex typedefs.expected; rm -f generated_macros.tex
13-
Generated LaTeX macros into generated_macros.tex
14-
12a13
15-
> \newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
16-
24d24
17-
< \newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
18-
30c30
19-
< \DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
20-
---
21-
> \DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
224
$ aslspec relations.spec --render; diff -w generated_macros.tex relations.expected; rm -f generated_macros.tex
235
Generated LaTeX macros into generated_macros.tex
24-
9a10
25-
> \newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
26-
18d18
27-
< \newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
28-
26c26
29-
< \DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
30-
---
31-
> \DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
326
$ aslspec rule.spec --render; diff -w generated_macros.tex rule.expected; rm -f generated_macros.tex
337
Generated LaTeX macros into generated_macros.tex
34-
8a9
35-
> \newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
36-
12d12
37-
< \newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
38-
20c20
39-
< \DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
40-
---
41-
> \DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
428
$ aslspec operators.spec --render; diff -w generated_macros.tex operators.expected; rm -f generated_macros.tex
439
Generated LaTeX macros into generated_macros.tex
44-
10a11
45-
> \newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
46-
12d12
47-
< \newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
48-
18c18
49-
< \DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
50-
---
51-
> \DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
5210
$ aslspec type_name.bad
5311
Syntax Error: type_name.bad:1:9: illegal element-defining identifier: t2
5412
[1]

‎asllib/aslspec/tests.t/typedefs.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
\newcommand\C[0]{ \hyperlink{type-C}{\textsf{C}} } % Generated from C
1111
\newcommand\Int[0]{ \hyperlink{type-Int}{\textsf{Int}} } % Generated from Int
1212
\newcommand\LRec[0]{ \hyperlink{type-LRec}{\textsf{LRec}} } % Generated from LRec
13-
\newcommand\None[0]{ \hyperlink{constant-None}{\textsf{None}} } % Generated from None
1413
\newcommand\Number[0]{ \hyperlink{ast-Number}{\textsc{Number}} } % Generated from Number
1514
\newcommand\One[0]{ \hyperlink{constant-One}{\textsf{One}} } % Generated from One
1615
\newcommand\Plus[0]{ \hyperlink{ast-Plus}{\textsc{Plus}} } % Generated from Plus
@@ -22,12 +21,13 @@
2221
\newcommand\expr[0]{ \hyperlink{ast-expr}{\textsf{expr}} } % Generated from expr
2322
\newcommand\FIELDf[0]{ \hyperlink{recordfield-f}{\textsf{f}} } % Generated from f
2423
\newcommand\FIELDg[0]{ \hyperlink{recordfield-g}{\textsf{g}} } % Generated from g
24+
\newcommand\none[0]{ \hyperlink{constant-none}{\textsf{none}} } % Generated from none
2525

2626
% -------------------
2727
% Macros for elements
2828
% -------------------
2929

30-
\DefineConstant{None}{\texthypertarget{constant-None}$\None$} % EndDefineConstant
30+
\DefineConstant{none}{\texthypertarget{constant-none}$\none$} % EndDefineConstant
3131

3232
\DefineConstant{empty_set}{\texthypertarget{constant-emptyset}$\emptyset$} % EndDefineConstant
3333

‎asllib/doc/notice.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ \chapter{Non-Confidential Proprietary Notice}
5151

5252
\url{https://www.arm.com/company/policies/trademarks.}
5353

54-
Copyright © [2023--2025] Arm Limited (or its affiliates). All rights reserved.
54+
Copyright © [2023--2026] Arm Limited (or its affiliates). All rights reserved.
5555

5656
Arm Limited. Company 02557590 registered in England. 110 Fulbourn Road,
5757
Cambridge, England CB1 9NJ. (LES-PRE-20349)

0 commit comments

Comments
 (0)