rework sysval-s.

doc/sysval.md

@@ -1,50 +1,9 @@
 # System values
 
-- System values are variables or more-likely constants that can be accessed from the PawnScript code, but are used and updated internally. Below is a list of accessible system values.
+- System values are variables or more-likely constants that can be accessed from the PawnScript code, but are used and updated internally. Below is a list of accessible system values. System values are prefixed with `$`.
 
-## `__proccessed_form_id`
 
-Return type: `int`
-
-- Returns a processed form id.
-
-```cpp
-new[int]formid=__proccessed_form_id
-console.println("'inlinetest' is {formid}")
-```
-
-## `__majorver`
-
-Return type: `int`
-
-- Returns the major version number.
-
-## `__minorver`
-
-Return type: `int`
-
-- Returns the minor version number.
-
-## `__patch`
-
-Return type: `int`
-
-- Returns the patch version number.
-
-## `__release`
-
-Return type: `int`
-
-- Returns the version release number.
-
-## `__beta`
-
-Return type: `int`
-
-- Returns 1 if the build is beta and 0 if the build is stable.
-
-
-## `__procspeed`
+## `$system.speed`
 
 Return type: `int`
 
@@ -53,11 +12,12 @@ Return type: `int`
 
 ```cpp
 @task
-	this->interval=1000
-void supercooltask() public
+	this->interval=4000
+	this->repeat=true
+void myTask() private
 {
-	new[int]process_speed=__procspeed
-	console.println.log("Process execution speed: {process_speed} Hz")
+	new[int]process_speed=$system.speed
+	console.println("Process speed: {process_speed} Hz")
 	#undef:process_speed
 }
 ```

src/modules/header.inc

@@ -755,6 +755,13 @@ stock dpp_createtask(const name[], interval, repeat)
 stock dpp_argsystemval(arg[])
 {
     new newvalue[dpp_argcharsize];
+
+    if(!strcmp(arg, "__procspeed") || !strcmp(arg, "$system.speed"))
+    {
+        format(newvalue, sizeof newvalue, "%i", dpp_speedhz);
+        strmid(arg, newvalue, 0, dpp_argcharsize, dpp_argcharsize);
+    }
+    //keeping these for backwards compatibility
     if(!strcmp(arg, "__proccessed_form_id"))
     {
         format(newvalue, sizeof newvalue, "%i", dpp_processfunc);
@@ -785,11 +792,6 @@ stock dpp_argsystemval(arg[])
         format(newvalue, sizeof newvalue, "%i", DPP_VERSION_BETA);
         strmid(arg, newvalue, 0, dpp_argcharsize, dpp_argcharsize);
     }
-    if(!strcmp(arg, "__procspeed"))
-    {
-        format(newvalue, sizeof newvalue, "%i", dpp_speedhz);
-        strmid(arg, newvalue, 0, dpp_argcharsize, dpp_argcharsize);
-    }
     return 1;
 }
 ////////////////

st3/syntax.yaml

@@ -34,7 +34,7 @@ contexts:
     - match: '\b(-)?[0-9.@#]+\b'
       scope: constant.numeric.example-c
 
-    - match: '\b(true|false|default)\b'
+    - match: '\b(true|false|default|callback)\b'
       scope: constant.numeric.example-c
 
     - match: '[@#]'
@@ -75,6 +75,9 @@ contexts:
     - match: '\b(this|user)\b'
       scope: variable.parameter.c++
 
+    - match: '\b($system)\b'
+      scope: variable.parameter.c++
+
     - match: '[\w]+\('
       scope: entity.name.impl.example-c
     - match: '\)'