Updating until keyword (using AST ETS) (#146 #145)

James Brundage · James Brundage · commit 6db015059bcf · 2022-07-25T21:07:15.000-07:00
diff --git a/Transpilers/Keywords/Until.psx.ps1 b/Transpilers/Keywords/Until.psx.ps1
@@ -61,11 +61,11 @@ process {
     if (-not $firstArg -or $firstArg.GetType().Name -notin 
         'ParenExpressionAst', 'ScriptBlockExpressionAst',
         'VariableExpressionAst','MemberExpressionAst','ExpandableStringExpressionAst') {
-        Write-Error "Until must be followed by a Variable, Member, String, or Parenthesis Expression"
+        Write-Error "Until must be followed by a Variable, Member, ExpandableString, or Parenthesis Expression"
         return
     }
 
-    if ($secondArg -isnot [Management.Automation.Language.ScriptBlockExpressionAst]) {
+    if ($secondArg -isnot [Scriptblock]) {
         Write-Error "Until must be followed by a condition and a ScriptBlock"
         return
     }
@@ -83,7 +83,7 @@ process {
     }
 
     $conditionScript = [ScriptBlock]::Create($condition)
-    $LoopScript = $secondArg.Extent.ToString() -replace '^\{' -replace '\}$'    
+    $LoopScript = $secondArg
 
     $secondArgScriptBlock = [ScriptBlock]::Create($LoopScript)
     

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ process {`
`61`	`61`	`if (-not $firstArg -or $firstArg.GetType().Name -notin`
`62`	`62`	`'ParenExpressionAst', 'ScriptBlockExpressionAst',`
`63`	`63`	`'VariableExpressionAst','MemberExpressionAst','ExpandableStringExpressionAst') {`
`64`		`- Write-Error "Until must be followed by a Variable, Member, String, or Parenthesis Expression"`
	`64`	`+ Write-Error "Until must be followed by a Variable, Member, ExpandableString, or Parenthesis Expression"`
`65`	`65`	`return`
`66`	`66`	`}`
`67`	`67`
`68`		`- if ($secondArg -isnot [Management.Automation.Language.ScriptBlockExpressionAst]) {`
	`68`	`+ if ($secondArg -isnot [Scriptblock]) {`
`69`	`69`	`Write-Error "Until must be followed by a condition and a ScriptBlock"`
`70`	`70`	`return`
`71`	`71`	`}`
`@@ -83,7 +83,7 @@ process {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$conditionScript = [ScriptBlock]::Create($condition)`
`86`		`- $LoopScript = $secondArg.Extent.ToString() -replace '^\{' -replace '\}$'`
	`86`	`+ $LoopScript = $secondArg`
`87`	`87`
`88`	`88`	`$secondArgScriptBlock = [ScriptBlock]::Create($LoopScript)`
`89`	`89`