From d652155ae013f36a1ee17653a8e458baad2d9c2c Mon Sep 17 00:00:00 2001
From: Checkmate50 <dgeisler50@gmail.com>
Date: Mon, 6 Jun 2016 23:14:18 -0600
Subject: Merging complete.  Everything looks good *crosses fingers*

---
 Source/Forro/Main.fs | 114 +++++++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

(limited to 'Source/Forro/Main.fs')

diff --git a/Source/Forro/Main.fs b/Source/Forro/Main.fs
index 3b0f550f..07d1a12e 100644
--- a/Source/Forro/Main.fs
+++ b/Source/Forro/Main.fs
@@ -1,57 +1,57 @@
-open System
-open Microsoft.FSharp.Text.Lexing
-
-open System.IO
-
-open ForroPrinter
-open Resolver
-open Lexer
-open Parser
-open BoogiePrinter
-
-open Translator
-
-let readAndProcess tracing (filename: string) =
-    try
-        if tracing then printfn "Forró: version 1.0" else ()
-        // lex
-        let f = if filename = null then Console.In else new StreamReader(filename) :> TextReader
-        let lexbuf = LexBuffer<char>.FromTextReader(f)
-        lexbuf.EndPos <- { pos_bol = 0;
-                           pos_fname=if filename = null then "stdin" else filename; 
-                           pos_cnum=0;
-                           pos_lnum=1 }
-        // parse
-        let prog = Parser.start Lexer.tokenize lexbuf
-        // print the given Forró program
-        if tracing then
-            printfn "---------- Given Forró program ----------"
-            Print prog
-        else ()
-        // make sure the program is legal
-        let rprog = Resolve prog
-        // translate into Boogie
-        let bprog = Translate rprog
-        // print the Boogie program
-        if tracing then printfn "---------- Resulting Boogie program ----------" else ()
-        BPrint bprog
-        // that's it
-        if tracing then printfn "----------" ; printfn "Done" else ()
-
-    with
-     | ResolutionError(msg) ->
-        printfn "Resolution error: %s" msg            
-     | ex ->
-        printfn "Unhandled Exception: %s" ex.Message
-
-let rec start n (args: string []) tracing filename =
-  if n < args.Length then
-    let arg = args.[n]
-    if arg = "/break" then ignore (System.Diagnostics.Debugger.Launch()) else ()
-    let filename = if arg.StartsWith "/" then filename else arg
-    start (n+1) args (tracing || arg = "/trace") filename
-  else
-    readAndProcess tracing filename
-
-let args = Environment.GetCommandLineArgs()
-start 1 args false null
+open System
+open Microsoft.FSharp.Text.Lexing
+
+open System.IO
+
+open ForroPrinter
+open Resolver
+open Lexer
+open Parser
+open BoogiePrinter
+
+open Translator
+
+let readAndProcess tracing (filename: string) =
+    try
+        if tracing then printfn "Forró: version 1.0" else ()
+        // lex
+        let f = if filename = null then Console.In else new StreamReader(filename) :> TextReader
+        let lexbuf = LexBuffer<char>.FromTextReader(f)
+        lexbuf.EndPos <- { pos_bol = 0;
+                           pos_fname=if filename = null then "stdin" else filename; 
+                           pos_cnum=0;
+                           pos_lnum=1 }
+        // parse
+        let prog = Parser.start Lexer.tokenize lexbuf
+        // print the given Forró program
+        if tracing then
+            printfn "---------- Given Forró program ----------"
+            Print prog
+        else ()
+        // make sure the program is legal
+        let rprog = Resolve prog
+        // translate into Boogie
+        let bprog = Translate rprog
+        // print the Boogie program
+        if tracing then printfn "---------- Resulting Boogie program ----------" else ()
+        BPrint bprog
+        // that's it
+        if tracing then printfn "----------" ; printfn "Done" else ()
+
+    with
+     | ResolutionError(msg) ->
+        printfn "Resolution error: %s" msg            
+     | ex ->
+        printfn "Unhandled Exception: %s" ex.Message
+
+let rec start n (args: string []) tracing filename =
+  if n < args.Length then
+    let arg = args.[n]
+    if arg = "/break" then ignore (System.Diagnostics.Debugger.Launch()) else ()
+    let filename = if arg.StartsWith "/" then filename else arg
+    start (n+1) args (tracing || arg = "/trace") filename
+  else
+    readAndProcess tracing filename
+
+let args = Environment.GetCommandLineArgs()
+start 1 args false null
-- 
cgit v1.2.3