fixes due to findings by Grover (P1 testing)

- Clean up Syntax recognition of block names - Statements like 'DAT{{' caused problems (exposed other potential issues, which are now fixed) - Clean up Semantic highlighting of code in presence of statements like 'DAT{{' - P2 BUGFIX repair VAR name detection when storage type not provided
ironsheep · Jan 2, 2024 · b0df2d1 · b0df2d1
1 parent 2877930
commit b0df2d1
Show file tree

Hide file tree

Showing 21 changed files with 1,061 additions and 1,063 deletions.
diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md
@@ -18,6 +18,14 @@ Possible next additions:
 - Add new-file templates as Snippets
 - Add additional Snippets as the community identifies them
 
+## [2.2.12] 2024-01-02
+
+Update P1 and P2
+
+- Clean up Syntax recognition of block names - Statements like 'DAT{{' caused problems (exposed other potential issues, which are now fixed)
+- Clean up Semantic highlighting of code in presence of statements like 'DAT{{'
+- P2 BUGFIX repair VAR name detection when storage type not provided
+
 ## [2.2.11] 2023-12-30
 
 Update P2 Only

diff --git a/spin2/TEST_LANG_SERVER/spin/_method_signature_demo.spin b/spin2/TEST_LANG_SERVER/spin/_method_signature_demo.spin
@@ -1,6 +1,6 @@
 CON
 
-PUB main() : ok
+PUB main : ok
 '' our main entry point
 ''
 '' @returns ok - return T/F where T means start succeeded

diff --git a/spin2/TEST_LANG_SERVER/spin2/221206-fixes.spin2 b/spin2/TEST_LANG_SERVER/spin2/221206-fixes.spin2
@@ -55,7 +55,6 @@ pn_             res     1       'pin(s)
 ' -----------------------------------------------------------------
 
 CON
-  _clkfreq = 100_000_000
   debug_main					'single-step through main code <---- BAD debug_main is NOT a constant
 
   debug_coginit					'single-step through main code <---- BAD debug_main is NOT a constant
@@ -105,7 +104,7 @@ DAT
 launch_spin	loc	ptrb,#\$80000		'point to zeroes in empty hub space
 
 ' -----------------------------------------------------------------
-CON _clkfreq = 200_000_000
+CON
 
     'debug_main				'uncomment to single-step through everything, even COGINITs
     'debug_coginit			'uncomment to break on COGINITs

diff --git a/...TEST_LANG_SERVER/spin2/231230-fixes.spin2 → ...LANG_SERVER/spin2/chk_dupe_declares.spin2 b/...TEST_LANG_SERVER/spin2/231230-fixes.spin2 → ...LANG_SERVER/spin2/chk_dupe_declares.spin2
diff --git a/spin2/TEST_LANG_SERVER/spin2/debug_coloring_examples.spin2 b/spin2/TEST_LANG_SERVER/spin2/debug_coloring_examples.spin2
@@ -48,7 +48,6 @@ PUB go() | i
 ' -----------------
 '  SCOPE (2)
 
-CON _clkfreq = 100_000_000
 
 PUB go2() | a, af, b, bf
   debug(`SCOPE MyScope)
@@ -63,7 +62,6 @@ PUB go2() | a, af, b, bf
 
 ' -----------------
 ' TERM (1)
-CON _clkfreq = 10_000_000
 
 PUB go3() | i
   debug(`TERM MyTerm SIZE 9 1 TEXTSIZE 40)
@@ -75,7 +73,6 @@ PUB go3() | i
 ' -----------------
 ' LOGIC (1)
 
-CON _clkfreq = 10_000_000
 PUB go4() | i
   debug(`LOGIC MyLogic SAMPLES 32 'Low' 3 'Mid' 2 'High')
   debug(`MyLogic TRIGGER $07 $04 HOLDOFF 2)
@@ -87,14 +84,13 @@ PUB go4() | i
 ' -----------------
 ' LOGIC (2)
 
-CON _clkfreq  = 333_333_333  'go really fast, 3ns clock period
-    rxpin = 24
+CON rxpin = 24
     txpin = rxpin + 1
     samps = 32
     bufflongs = samps / 16
     xmode = $D0800000 + rxpin << 17 + samps   'streamer mode
 
-VAR     buff[bufflongs]
+VAR     buff[bufflongs + samps]
 
 PUB go5() | i, buffaddr
 
@@ -125,7 +121,6 @@ repeat
 ' -----------------
 ' FFT
 
-CON _clkfreq = 100_000_000
 PUB go6() | i, j, k
   ' Set up FFT
   debug(`FFT MyFFT SIZE 250 200 SAMPLES 2048 0 127 RATE 256 LOGSCALE COLOR YELLOW 4 YELLOW 5)
@@ -143,7 +138,6 @@ PUB go6() | i, j, k
 ' -----------------
 ' Spectro
 
-CON _clkfreq = 100_000_000
 PUB go7() | i, j, k
   ' Set up SPECTRO
   debug(`SPECTRO MySpectro SAMPLES 2048 0 236 RANGE 1000 LUMA8X GREEN)
@@ -160,7 +154,6 @@ PUB go7() | i, j, k
 ' -----------------
 ' Plot
 
-CON _clkfreq = 10_000_000
 PUB go8(): i, j, k
   debug(`plot myplot size 400 480 backcolor white update)
   debug(`myplot origin 200 200 polar -64 -16)
@@ -189,7 +182,6 @@ PUB go8(): i, j, k
 ' -----------------
 ' Bitmap
 
-CON _clkfreq = 10_000_000
 PUB go9() | i
   debug(`bitmap MyBitmap SIZE 32 16 DOTSIZE 8 LUT2 LONGS_2BIT)
   debug(`MyBitmap TRACE 14 LUTCOLORS WHITE RED BLUE YELLOW 6)
@@ -233,7 +225,6 @@ flag    long %%3333333333333330
 ' -----------------
 ' Bitmap (2)
 
-CON _clkfreq = 100_000_000
 PUB go10() | i
     debug(`bitmap a title 'LUT1'  pos 100 100 trace 2 lut1 longs_1bit alt)
     debug(`bitmap b title 'LUT2'  pos 370 100 trace 2 lut2 longs_2bit alt)

diff --git a/spin2/TEST_LANG_SERVER/spin2/docs-spin2-language.spin2 b/spin2/TEST_LANG_SERVER/spin2/docs-spin2-language.spin2
@@ -35,12 +35,12 @@ CON
 ' -----------------------------------------------------------------------------
 
    CON_NAME = CLKMODE
-   CON_NAME = CLKFREQ
+   CON_NAME2 = CLKFREQ
 
 CON
 
-   CON_NAME = CLKMODE
-   CON_NAME = CLKFREQ
+   CON_NAME3 = CLKMODE
+   CON_NAME4 = CLKFREQ
 
 PUB something()
 

diff --git a/spin2/client/src/spin.code.utils.ts b/spin2/client/src/spin.code.utils.ts
@@ -112,7 +112,7 @@ export class SpinCodeUtils {
       }
     }
     if (startStatus) {
-      this._logMessage("** isSectStart line=[" + line + "]");
+      this._logMessage(`** isSectStart codeUt line=[${line}]`);
     }
     return {
       isSectionStart: startStatus,

diff --git a/spin2/package.json b/spin2/package.json
@@ -5,7 +5,7 @@
   "icon": "images/Propeller.ico",
   "author": "IronSheep",
   "license": "MIT",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/ironsheep/P2-vscode-langserv-extension"

diff --git a/spin2/scripts/LIVE-package.json b/spin2/scripts/LIVE-package.json
@@ -5,7 +5,7 @@
   "icon": "images/Propeller.ico",
   "author": "IronSheep",
   "license": "MIT",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/ironsheep/P2-vscode-langserv-extension"

diff --git a/spin2/scripts/TEST-package.json b/spin2/scripts/TEST-package.json
@@ -4,7 +4,7 @@
   "description": "P1 and P2 Spin/Pasm Syntax/Semantic Highlighting w/Code Outline, Object Outline and Custom tabbing support",
   "author": "IronSheep",
   "license": "MIT",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/ironsheep/P2-vscode-langserv-extension"

diff --git a/spin2/server/src/parser/spin.extension.utils.ts b/spin2/server/src/parser/spin.extension.utils.ts
@@ -78,7 +78,7 @@ export class ExtensionUtils {
       }
     }
     if (startStatus) {
-      this._logMessage("** isSectStart line=[" + line + "]");
+      this._logMessage(`** isSectStart extUt line=[${line}]`);
     }
     return {
       isSectionStart: startStatus,

diff --git a/spin2/server/src/parser/spin.semantic.findings.ts b/spin2/server/src/parser/spin.semantic.findings.ts
@@ -1600,7 +1600,7 @@ export class DocumentFindings {
   }
 
   public setOutlineSymbol(newSymbol: OutLineSymbol) {
-    this._logMessage(`  OUTLINE setOutlineSymbol(${newSymbol.label}) = ${newSymbol.kind}`);
+    this._logMessage(`  OUTLINE setOutlineSymbol(${newSymbol.label}) = ${newSymbol.kind()}`);
     this.outlineSymbols.push(newSymbol);
   }