From d4a1921d7373b1c74d3ef74c7f7b1a91780941e0 Mon Sep 17 00:00:00 2001 From: William Barnes Date: Fri, 3 Jun 2022 08:22:06 -0400 Subject: [PATCH] Commented out experimental lines in Data/Read/Restore system. --- qb2js.js | 49 +-------------------------- tools/qb2js.bas | 89 +++++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 91 deletions(-) diff --git a/qb2js.js b/qb2js.js index 215342c..cf49f63 100644 --- a/qb2js.js +++ b/qb2js.js @@ -1,7 +1,5 @@ async function _QBCompiler() { - dataTicker = 1; - dataTicker = 1; // Option _Explicit // $Console // Only @@ -30,6 +28,7 @@ async function _QBCompiler() { var currentModule = ''; // STRING var programMethods = 0; // INTEGER var dataTicker = 0; // INTEGER + dataTicker = 1; if (QB.func_Command() != "" ) { await sub_QBToJS( QB.func_Command(), FILE, ""); await sub_PrintJS(); @@ -1625,15 +1624,6 @@ var ReadLine = null; } } ReadLine = rawJS; - if (((QB.func__Trim( (QB.func_LCase( (QB.func_Left( fline, 4)))))) == "data") ) { - await sub_AddLineTop( dataTicker, fline); - await sub_AddSubLinesTop( dataTicker, fline); - return ReadLine; - } - if (((QB.func__Trim( (QB.func_LCase( (QB.func_Left( fline, 6)))))) == "_label") ) { - await sub_AddLineTop( dataTicker, fline); - return ReadLine; - } if ((QB.func__Trim( fline)) == "" ) { return ReadLine; } @@ -1712,29 +1702,6 @@ if (QB.halted()) { return; } } await sub_AddLine( lineIndex, fline); } -async function sub_AddSubLinesTop(lineIndex/*INTEGER*/,fline/*STRING*/) { -if (QB.halted()) { return; } - var quoteDepth = 0; // INTEGER - quoteDepth = 0; - var i = 0; // INTEGER - for ( i= 1; i <= (QB.func_Len( fline)); i= i + 1) { if (QB.halted()) { return; } - var c = ''; // STRING - c = (QB.func_Mid( fline, i, 1)); - if ( c == (QB.func_Chr( 34)) ) { - if ( quoteDepth == 0) { - quoteDepth = 1; - } else { - quoteDepth = 0; - } - } - if ( quoteDepth == 0 && c == ":" ) { - await sub_AddLineTop( lineIndex, (QB.func_Left( fline, i - 1))); - fline = (QB.func_Right( fline, (QB.func_Len( fline)) - i)); - i = 0; - } - } - await sub_AddLineTop( lineIndex, fline); -} async function sub_FindMethods() { if (QB.halted()) { return; } var i = 0; // INTEGER @@ -2132,20 +2099,6 @@ if (QB.halted()) { return; } m.name = mname; await sub_AddMethod( m, "QB.", sync); } -async function sub_AddLineTop(lineIndex/*INTEGER*/,fline/*STRING*/) { -if (QB.halted()) { return; } - var lcount = 0; // INTEGER - lcount = (QB.func_UBound( lines)) + 1; - QB.resizeArray(lines, [{l:1,u:lcount}], {line:0,text:''}, true); // CODELINE - var j = 0; // INTEGER - for ( j=(QB.func_UBound( lines)) ; j >= dataTicker; j= j + -1) { if (QB.halted()) { return; } - QB.arrayValue(lines, [ j]).value .line = QB.arrayValue(lines, [ j - 1]).value .line; - QB.arrayValue(lines, [ j]).value .text = QB.arrayValue(lines, [ j - 1]).value .text; - } - QB.arrayValue(lines, [ dataTicker]).value .line = dataTicker; - QB.arrayValue(lines, [ dataTicker]).value .text = fline; - dataTicker = dataTicker + 1; -} async function sub_AddLine(lineIndex/*INTEGER*/,fline/*STRING*/) { if (QB.halted()) { return; } await sub___AddLine( lineIndex, fline); diff --git a/tools/qb2js.bas b/tools/qb2js.bas index adec582..2743333 100644 --- a/tools/qb2js.bas +++ b/tools/qb2js.bas @@ -1712,15 +1712,18 @@ Function ReadLine (lineIndex As Integer, fline As String, rawJS As Integer) ReadLine = rawJS - If (_Trim$(LCase$(Left$(fline, 4))) = "data") Then - AddLineTop dataTicker, fline - AddSubLinesTop dataTicker, fline - Exit Function - End If - If (_Trim$(LCase$(Left$(fline, 6))) = "_label") Then - AddLineTop dataTicker, fline - Exit Function - End If + 'If (_Trim$(LCase$(Left$(fline, 4))) = "data") Then + ' 'AddLineTop dataTicker, fline + ' 'AddSubLinesTop dataTicker, fline + ' AddLine dataTicker, fline + ' AddSubLines dataTicker, fline + ' Exit Function + 'End If + 'If (_Trim$(LCase$(Left$(fline, 6))) = "_label") Then + ' 'AddLineTop dataTicker, fline + ' AddLine dataTicker, fline + ' Exit Function + 'End If If _Trim$(fline) = "" Then Exit Function @@ -1802,29 +1805,29 @@ Sub AddSubLines (lineIndex As Integer, fline As String) AddLine lineIndex, fline End Sub -Sub AddSubLinesTop (lineIndex As Integer, fline As String) - Dim quoteDepth As Integer - quoteDepth = 0 - Dim i As Integer - For i = 1 To Len(fline) - Dim c As String - c = Mid$(fline, i, 1) - If c = Chr$(34) Then - If quoteDepth = 0 Then - quoteDepth = 1 - Else - quoteDepth = 0 - End If - End If - If quoteDepth = 0 And c = ":" Then - AddLineTop lineIndex, Left$(fline, i - 1) - fline = Right$(fline, Len(fline) - i) - i = 0 - End If - Next i +'Sub AddSubLinesTop (lineIndex As Integer, fline As String) +' Dim quoteDepth As Integer +' quoteDepth = 0 +' Dim i As Integer +' For i = 1 To Len(fline) +' Dim c As String +' c = Mid$(fline, i, 1) +' If c = Chr$(34) Then +' If quoteDepth = 0 Then +' quoteDepth = 1 +' Else +' quoteDepth = 0 +' End If +' End If +' If quoteDepth = 0 And c = ":" Then +' AddLineTop lineIndex, Left$(fline, i - 1) +' fline = Right$(fline, Len(fline) - i) +' i = 0 +' End If +' Next i - AddLineTop lineIndex, fline -End Sub +' AddLineTop lineIndex, fline +'End Sub Sub FindMethods Dim i As Integer @@ -2270,18 +2273,18 @@ Sub AddQBMethod (mtype As String, mname As String, sync As Integer) AddMethod m, "QB.", sync End Sub -Sub AddLineTop (lineIndex As Integer, fline As String) - Dim lcount As Integer: lcount = UBound(lines) + 1 - ReDim _Preserve As CodeLine lines(lcount) - Dim j As Integer - For j = UBound(lines) To dataTicker Step -1 - lines(j).line = lines(j - 1).line - lines(j).text = lines(j - 1).text - Next - lines(dataTicker).line = dataTicker - lines(dataTicker).text = fline - dataTicker = dataTicker + 1 -End Sub +'Sub AddLineTop (lineIndex As Integer, fline As String) +' Dim lcount As Integer: lcount = UBound(lines) + 1 +' ReDim _Preserve As CodeLine lines(lcount) +' Dim j As Integer +' For j = UBound(lines) To dataTicker Step -1 +' lines(j).line = lines(j - 1).line +' lines(j).text = lines(j - 1).text +' Next +' lines(dataTicker).line = dataTicker +' lines(dataTicker).text = fline +' dataTicker = dataTicker + 1 +'End Sub Sub AddLine (lineIndex As Integer, fline As String) __AddLine lineIndex, fline