Fixing merge conflict

Author: James Brundage

Invoke-PipeScript.ps1

@@ -497,7 +497,10 @@
             elseif ($script:TypeAcceleratorsList -notcontains $transpilerStepName -and $transpilerStepName -notin 'Ordered') {
                 $psCmdlet.WriteError(
                     [Management.Automation.ErrorRecord]::new(
-                        [exception]::new("Unable to find a transpiler for [$TranspilerStepName]")
+                        [exception]::new("Unable to find a transpiler for [$TranspilerStepName]"),
+                        'Transpiler.Not.Found',
+                        'ParserError',
+                        $command
                     )
                 )
 

Transpilers/Core/PipeScript.ParameterAttribute.psx.ps1

@@ -1,4 +1,5 @@
 <#
+
 #>
 [ValidateScript({
     $_.Parent -is [Management.Automation.Language.ParameterAst]

Transpilers/Core/PipeScript.TypeExpression.psx.ps1

@@ -58,7 +58,7 @@ process {
         } else {
             $TypeExpressionAst.TypeName.Name
         }
-
+    
     if ($transpilerStepName -eq 'ordered') { return }
 
     $foundTranspiler =

Transpilers/Parameters/ValidateTypes.psx.ps1

@@ -50,8 +50,33 @@ $TypeName,
 $VariableAST
 )
 
+# Determine the list of real types at this point in time
+$realTypes = 
+    @(foreach ($tn in $typeName) {
+        if ($tn -as [type]) {
+            $tn -as [type]
+        }
+    })
+
+# If all of the types are .NET types
+if ($realTypes.Length -eq $TypeName.Length) {
+    $checkTypes = @"
+`$validTypeList = [$($realTypes -join '],[')]
+"@ + {
+
+$thisType = $_.GetType()
+$IsTypeOk =
+    $(@( foreach ($validType in $validTypeList) {
+        if ($_ -as $validType) {
+            $true;break
+        }
+    }))
+}
+
+
+} else {
 
-$checkTypes = @"
+    $checkTypes = @"
 `$validTypeList = '$($typeName -join "','")'
 "@ + {
 $thisType = @(
@@ -87,7 +112,7 @@ $IsTypeOk =
         }
     }) -eq $true) -as [bool]
 }
-
+}
 if ($PSCmdlet.ParameterSetName -eq 'Parameter') {
 [scriptblock]::Create(@"
 [ValidateScript({

Transpilers/Syntax/RegexLiteral.psx.ps1

@@ -15,6 +15,10 @@
     # This will become:
 
     [regex]::new('[a|b]', 'IgnoreCase')
+.EXAMPLE
+    Invoke-PipeScript {
+        '/[a|b]/'.Matches('ab')
+    }
 .EXAMPLE
     {
         "/[$a|$b]/"