WIP1

nblockchain · Sep 4, 2024 · 6e6b2eb · 6e6b2eb
1 parent fcdf5c4
commit 6e6b2eb
Showing 1 changed file with 36 additions and 7 deletions.
diff --git a/fsxc/Fsxc.fs b/fsxc/Fsxc.fs
@@ -170,6 +170,15 @@ module Program =
         | Ref of string
         | NugetRef of name: string * version: Option<string>
 
+    type PreProcessorConditional =
+        | If
+        | Else
+        | EndIf
+
+    type PreProcessorElement =
+        | Action of PreProcessorAction
+        | Conditional of PreProcessorConditional
+
     type LineKind =
         | Commented
         | Normal
@@ -217,20 +226,23 @@ module Program =
 
     let ReadScriptContents(origScript: FileInfo) : List<LineAction> =
 
-        let readPreprocessorLine(line: string) : Option<PreProcessorAction> =
+        let readPreprocessorLine(line: string) : Option<PreProcessorElement> =
             let trimmedLine = line.TrimStart()
             if not (trimmedLine.StartsWith "#") then
                 None
             elif (line.StartsWith "#!") then
-                Some PreProcessorAction.Skip
+                PreProcessorAction.Skip
+                |> PreProcessorElement.Action
+                |> Some
             elif (line.StartsWith LOAD_PREPROCESSOR) then
                 let fileToLoad =
                     line.Substring(
                         LOAD_PREPROCESSOR.Length,
                         line.Length - LOAD_PREPROCESSOR.Length - 1
                     )
-
-                PreProcessorAction.Load fileToLoad |> Some
+                PreProcessorAction.Load fileToLoad
+                |> PreProcessorElement.Action
+                |> Some
             elif line.StartsWith REFNUGET_PREPROCESSOR then
                 let libToRef =
                     line.Substring(
@@ -272,7 +284,9 @@ module Program =
                     else
                         libToRef, None
 
-                PreProcessorAction.NugetRef(libName, maybeVersion) |> Some
+                PreProcessorAction.NugetRef(libName, maybeVersion)
+                |> PreProcessorElement.Action
+                |> Some
 
             elif (line.StartsWith REF_PREPROCESSOR) then
                 let libToRef =
@@ -281,7 +295,21 @@ module Program =
                         line.Length - REF_PREPROCESSOR.Length - 1
                     )
 
-                PreProcessorAction.Ref libToRef |> Some
+                PreProcessorAction.Ref libToRef
+                |> PreProcessorElement.Action
+                |> Some
+            elif trimmedLine.StartsWith "#else" then
+                PreProcessorConditional.Else
+                |> PreProcessorElement.Conditional
+                |> Some
+            elif trimmedLine.StartsWith "#endif" then
+                PreProcessorConditional.EndIf
+                |> PreProcessorElement.Conditional
+                |> Some
+            elif trimmedLine.StartsWith "#if" then
+                PreProcessorConditional.If
+                |> PreProcessorElement.Conditional
+                |> Some
             else
                 failwithf "Unrecognized preprocessor line: %s" line
 
@@ -299,8 +327,9 @@ module Program =
                     let noStateChange() =
                         let lineKind =
                             match readPreprocessorLine line with
-                            | Some action -> LineKind.PreProcessorAction action
+                            | Some (PreProcessorElement.Action action) -> LineKind.PreProcessorAction action
                             | None -> LineKind.Normal
+                            | Some elt -> failwithf "Unexpected element %A" elt
 
                         let newAcc =
                             {