Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Q# Keywords #4586

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Update Q# Keywords #4586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
333adbb
Add keywords `import`, `export`, and `struct`.
ScottCarda-MS Jul 1, 2024
2f8db3f
update tokenizer and tests
ScottCarda-MS Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 70 additions & 46 deletions src/basic-languages/qsharp/qsharp.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import { testTokenization } from '../test/testRunner';

testTokenization('qsharp', [
// Generated from sample: https://github.com/microsoft/Quantum/blob/main/samples/azure-quantum/parallel-qrng/ParallelQrng.ipynb
[
{
line: 'open Microsoft.Quantum.Arrays;',
Expand All @@ -21,19 +20,6 @@ testTokenization('qsharp', [
{ startIndex: 29, type: 'delimiter.qsharp' }
]
},
{
ScottCarda-MS marked this conversation as resolved.
Show resolved Hide resolved
line: 'open Microsoft.Quantum.Measurement;',
tokens: [
{ startIndex: 0, type: 'keyword.open.qsharp' },
{ startIndex: 4, type: 'white.qsharp' },
{ startIndex: 5, type: 'namespace.qsharp' },
{ startIndex: 14, type: 'delimiter.qsharp' },
{ startIndex: 15, type: 'namespace.qsharp' },
{ startIndex: 22, type: 'delimiter.qsharp' },
{ startIndex: 23, type: 'namespace.qsharp' },
{ startIndex: 34, type: 'delimiter.qsharp' }
]
},
{
line: '',
tokens: []
Expand Down Expand Up @@ -67,20 +53,6 @@ testTokenization('qsharp', [
{ startIndex: 1, type: 'comment.qsharp' }
]
},
{
line: ' // superposition state, such that when we measure,',
tokens: [
{ startIndex: 0, type: 'white.qsharp' },
{ startIndex: 1, type: 'comment.qsharp' }
]
},
{
line: ' // all bitstrings occur with equal probability.',
tokens: [
{ startIndex: 0, type: 'white.qsharp' },
{ startIndex: 1, type: 'comment.qsharp' }
]
},
{
line: ' use register = Qubit[nQubits] {',
tokens: [
Expand All @@ -99,13 +71,6 @@ testTokenization('qsharp', [
{ startIndex: 31, type: 'delimiter.curly.qsharp' }
]
},
{
line: ' // Set qubits in superposition.',
tokens: [
{ startIndex: 0, type: 'white.qsharp' },
{ startIndex: 2, type: 'comment.qsharp' }
]
},
{
line: ' ApplyToEachA(H, register);',
tokens: [
Expand All @@ -120,17 +85,6 @@ testTokenization('qsharp', [
{ startIndex: 27, type: 'delimiter.qsharp' }
]
},
{
line: '',
tokens: []
},
{
line: ' // Measure all qubits and return.',
tokens: [
{ startIndex: 0, type: 'white.qsharp' },
{ startIndex: 2, type: 'comment.qsharp' }
]
},
{
line: ' return ForEach(MResetZ, register);',
tokens: [
Expand All @@ -157,6 +111,76 @@ testTokenization('qsharp', [
{
line: '}',
tokens: [{ startIndex: 0, type: 'delimiter.curly.qsharp' }]
},
{
line: 'struct Foo { First : Int, Second : Int }',
tokens: [
{ startIndex: 0, type: 'keyword.qsharp' },
{ startIndex: 6, type: 'white.qsharp' },
{ startIndex: 7, type: 'identifier.qsharp' },
{ startIndex: 10, type: 'white.qsharp' },
{ startIndex: 11, type: 'delimiter.curly.qsharp' },
{ startIndex: 12, type: 'white.qsharp' },
{ startIndex: 13, type: 'identifier.qsharp' },
{ startIndex: 18, type: 'white.qsharp' },
{ startIndex: 19, type: 'operator.qsharp' },
{ startIndex: 20, type: 'white.qsharp' },
{ startIndex: 21, type: 'type.qsharp' },
{ startIndex: 24, type: 'delimiter.qsharp' },
{ startIndex: 25, type: 'white.qsharp' },
{ startIndex: 26, type: 'identifier.qsharp' },
{ startIndex: 32, type: 'white.qsharp' },
{ startIndex: 33, type: 'operator.qsharp' },
{ startIndex: 34, type: 'white.qsharp' },
{ startIndex: 35, type: 'type.qsharp' },
{ startIndex: 38, type: 'white.qsharp' },
{ startIndex: 39, type: 'delimiter.curly.qsharp' }
]
},
{
line: 'Foo.First',
tokens: [
{ startIndex: 0, type: 'identifier.qsharp' },
{ startIndex: 3, type: 'operator.qsharp' },
{ startIndex: 4, type: 'identifier.qsharp' }
]
},
{
line: 'import Microsoft.Quantum.Math, Microsoft.Quantum.Diagnostics.*;',
tokens: [
{ startIndex: 0, type: 'keyword.import.qsharp' },
{ startIndex: 6, type: 'white.qsharp' },
{ startIndex: 7, type: 'namespace.qsharp' },
{ startIndex: 16, type: 'delimiter.qsharp' },
{ startIndex: 17, type: 'namespace.qsharp' },
{ startIndex: 24, type: 'delimiter.qsharp' },
{ startIndex: 25, type: 'identifier.qsharp' },
{ startIndex: 29, type: 'delimiter.qsharp' },
{ startIndex: 30, type: 'white.qsharp' },
{ startIndex: 31, type: 'namespace.qsharp' },
{ startIndex: 40, type: 'delimiter.qsharp' },
{ startIndex: 41, type: 'namespace.qsharp' },
{ startIndex: 48, type: 'delimiter.qsharp' },
{ startIndex: 49, type: 'namespace.qsharp' },
{ startIndex: 60, type: 'delimiter.qsharp' },
{ startIndex: 61, type: 'wildcard.qsharp' },
{ startIndex: 62, type: 'delimiter.qsharp' }
]
},
{
line: 'export A, B, C;',
tokens: [
{ startIndex: 0, type: 'keyword.qsharp' },
{ startIndex: 6, type: 'white.qsharp' },
{ startIndex: 7, type: 'identifier.qsharp' },
{ startIndex: 8, type: 'delimiter.qsharp' },
{ startIndex: 9, type: 'white.qsharp' },
{ startIndex: 10, type: 'identifier.qsharp' },
{ startIndex: 11, type: 'delimiter.qsharp' },
{ startIndex: 12, type: 'white.qsharp' },
{ startIndex: 13, type: 'identifier.qsharp' },
{ startIndex: 14, type: 'delimiter.qsharp' }
]
}
]
]);
24 changes: 21 additions & 3 deletions src/basic-languages/qsharp/qsharp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ export const language = <languages.IMonarchLanguage>{
keywords: [
'namespace',
'open',
'import',
'export',
'as',
'operation',
'function',
'body',
'adjoint',
'newtype',
'struct',
'controlled',
'if',
'elif',
Expand Down Expand Up @@ -141,7 +144,6 @@ export const language = <languages.IMonarchLanguage>{
'stackalloc',
'static',
'string',
'struct',
'switch',
'this',
'throw',
Expand Down Expand Up @@ -202,6 +204,7 @@ export const language = <languages.IMonarchLanguage>{
'^=',
':',
'::',
'.',
'..',
'==',
'...',
Expand Down Expand Up @@ -241,6 +244,8 @@ export const language = <languages.IMonarchLanguage>{

namespaceFollows: ['namespace', 'open'],

importsFollows: ['import'],

symbols: /[=><!~?:&|+\-*\/\^%@._]+/,

escapes: /\\[\s\S]/,
Expand All @@ -257,6 +262,10 @@ export const language = <languages.IMonarchLanguage>{
token: 'keyword.$0',
next: '@namespace'
},
'@importsFollows': {
token: 'keyword.$0',
next: '@imports'
},
'@typeKeywords': 'type',
'@keywords': 'keyword',
'@constants': 'constant',
Expand All @@ -282,7 +291,7 @@ export const language = <languages.IMonarchLanguage>{
[/[;,.]/, 'delimiter'],

// strings
//[/"([^"\\]|\\.)*$/, 'string.invalid' ], // non-teminated string
//[/"([^"\\]|\\.)*$/, 'string.invalid' ], // non-terminated string
[/"/, { token: 'string.quote', bracket: '@open', next: '@string' }]
],

Expand All @@ -295,7 +304,16 @@ export const language = <languages.IMonarchLanguage>{
namespace: [
{ include: '@whitespace' },
[/[A-Za-z]\w*/, 'namespace'],
[/[\.=]/, 'delimiter'],
[/[\.]/, 'delimiter'],
['', '', '@pop']
],

imports: [
{ include: '@whitespace' },
[/[A-Za-z]\w*(?=\.)/, 'namespace'],
[/[A-Za-z]\w*/, 'identifier'],
[/\*/, 'wildcard'],
[/[\.,]/, 'delimiter'],
['', '', '@pop']
],

Expand Down
Loading