Skip to content

Fixed @defined and probe syntax #1

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

Open
Tanimodori wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed @defined and probe syntax #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4d03e0
Fixed: @defined is not a macro.
Tanimodori Oct 24, 2019
43f8dc9
Better probe syntax
Tanimodori Oct 24, 2019
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
46 changes: 25 additions & 21 deletions syntaxes/systemtap.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
},
"array": {},
"function_dec": {
"begin": "(function)\\s+([\\w.]+)",
"begin": "(function)\\s([\\w.]+)",
Copy link
Owner

@nzh63 nzh63 Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More than one space is legal, for example: function foo(bar)

"end": "(?=\\%?{)",
"beginCaptures": {
"1": {
Expand All @@ -164,12 +164,7 @@
},
"patterns": [
{
"begin": "(?:(?<=:)\\s*([^\\s\\:]+))?(\\()",
"beginCaptures": {
Copy link
Owner

@nzh63 nzh63 Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is processe the type of rreturn value (like function foo:long(bar))

"1": {
"name": "storage.type.built-in.systemtap"
}
},
"begin": "(\\()",
"end": "(?=[)])",
"patterns": [
{
Expand All @@ -185,36 +180,45 @@
]
},
"probe_dec": {
"begin": "(probe)\\s([\\w.]+)",
"begin": "(probe)\\s+(?![#\\{]+)",
"end": "(?=\\{)",
"beginCaptures": {
"1": {
"name": "keyword.control.systemtap"
},
"2": {
"name": "entity.name.function.definition.systemtap"
}
},
"patterns": [
{
"include": "#comment"
},
{
"match": "(process|function|module|statement|begin|end|syscall|return|call|never)(?![@a-zA-Z0-9_$])",
Copy link
Owner

@nzh63 nzh63 Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some probes not in this list, see https://sourceware.org/systemtap/tapsets/

"name": "keyword.control.systemtap"
},
{
"match": "([\\w]+)",
"name": "entity.name.function.definition.systemtap"
},
{
"match": "(\\.)",
"name": "punctuation.separator.dot.systemtap"
},
{
"begin": "(\\()",
"end": "(?=[)])",
"patterns": [
{
"include": "#string_context"
},
{
"include": "#number"
"include": "#expr"
Copy link
Owner

@nzh63 nzh63 Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this should not accept variables

},
{
"match": "(?<=:)([^\\s,):]+)",
"name": "storage.type.built-in.systemtap"
},
{
"match": "[^\\s,):]+",
"match": "[^\\s,)]+",
"name": "variable.parameter"
}
]
},
{
"match": "([*!?])",
"name": "keyword.operator.systemtap"
Copy link
Owner

@nzh63 nzh63 Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use keyword.operator.quantifier.systemtap instead

}
]
},
Expand Down Expand Up @@ -396,7 +400,7 @@
]
},
"macro": {
"begin": "(@(?:defined|define))",
"begin": "(@define(?!d))",
"end": "(?<!\\\\)(?=(?:\\%\\(|\\n))",
"beginCaptures": {
"1": {
Expand Down