Block lines bracketed and : removed

rmcn · Jan 14, 2013 · bd570f3 · bd570f3
1 parent 222c7c9
commit bd570f3
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 12 deletions.
diff --git a/PythonEmbrace.Tests/SimpleTests.cs b/PythonEmbrace.Tests/SimpleTests.cs
@@ -28,7 +28,7 @@ public void SingleIf()
 if c != u';':
     self.stream.unget(c)
 ----
-if c != u';':
+if( c != u';')
 {
     self.stream.unget(c);
 }
@@ -46,7 +46,7 @@ public void BracesBeforeBlankLines()
 
 self.stream.unget(c)
 ----
-if c != u';':
+if( c != u';')
 {
     self.stream.unget(c);
 }
@@ -65,7 +65,7 @@ public void BlankLinesDoNotAffectIndentationLevel()
 
     self.stream.unget(c)
 ----
-if c != u';':
+if( c != u';')
 {
 
     self.stream.unget(c);
@@ -85,7 +85,7 @@ public void BracketsAreImplicitLineContinuation()
     self.stream.unget(c)
 ----
 if (c != u';' and
-        c != ','):
+        c != ',')
 {
     self.stream.unget(c);
 }
@@ -103,7 +103,7 @@ public void BracketsInStringsAreIgnored()
     self.stream.unget(c)
 ----
 if (c != ')' and
-        c != ','):
+        c != ',')
 {
     self.stream.unget(c);
 }
@@ -121,7 +121,7 @@ public void EscapedQuotesDontEndStringsIgnored()
     self.stream.unget(c)
 ----
 if (c != ')\'' and
-        c != ','):
+        c != ',')
 {
     self.stream.unget(c);
 }
@@ -138,8 +138,8 @@ public void ExplicitLineContinuation()
         u';':
     self.stream.unget(c)
 ----
-if c != \
-        u';':
+if( c != \
+        u';')
 {
     self.stream.unget(c);
 }

diff --git a/PythonEmbrace/LogicalLine.cs b/PythonEmbrace/LogicalLine.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text;
 using System.Diagnostics;
+using System.Text.RegularExpressions;
 
 namespace PythonEmbrace
 {
@@ -16,19 +17,62 @@ public string Text
             {
                 if (_lastSignificantCharIndex != -1)
                 {
+                    string significantText = _text.ToString(0, _lastSignificantCharIndex + 1);
+                    string insignificantText = _text.ToString(significantText.Length, _text.Length - significantText.Length);
+
                     if (_text[_lastSignificantCharIndex] == ':')
                     {
                         // Block start
-                        // FIXME remove colon and bracket if necessary
+                        return ConvertBlockLine(significantText) + insignificantText;
                     }
                     else
                     {
-                        // End with a semicolon
-                        _text.Insert(_lastSignificantCharIndex + 1, ';');
+                        // Add a semicolon
+                        return significantText + ";" + insignificantText;
                     }
                 }
+                else
+                {
+                    // Entirely whitespace, or just a comment
+                    return _text.ToString();
+                }
+            }
+        }
+
+        private static readonly string[] BracketedKeywords = { "if", "elif", "for", "while", "except" };
+
+        private static readonly Regex BlockLinePattern =
+            new Regex(@"^(\s*)(if|else|elif|def|for|while|try|except|class)(.*):$",
+                RegexOptions.Compiled | RegexOptions.Singleline);
+
+        private string ConvertBlockLine(string significantText)
+        {
+            if (BlockLinePattern.IsMatch(significantText))
+            {
+                // FIXME remove colon and brackets if necessary
+                Match match = BlockLinePattern.Match(significantText);
 
-                return _text.ToString();
+                string whitespace = match.Groups[1].Value;
+                string keyword = match.Groups[2].Value;
+                string remainder = match.Groups[3].Value;
+
+                bool needsBrackets = BracketedKeywords.Contains(keyword) && !remainder.TrimStart().StartsWith("(");
+
+                if (keyword == "elif")
+                {
+                    keyword = "else if";
+                }
+                else if (keyword == "except")
+                {
+                    keyword = "catch";
+                }
+
+                return whitespace + keyword + (needsBrackets ? "(" : "") + remainder + (needsBrackets ? ")" : "");
+
+            }
+            else
+            {
+                throw new Exception("Line " + _lineNumber + " ends with a : but doesn't match BlockLinePattern");
             }
         }
 

diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@ A tool to help with the manual conversion of Python code to C family languages (
 It aims to take some of the grunt work out of the manual conversion. Run it on a *valid* python input file to produce an output file with:
 * Braces `{}` added, based on Python's indentation rules
 * Semicolons `;` added to the end of statements
+* Colons `:` removed from the end of lines that begin blocks
+* Brackets added to unbracked `if`, `elif`, `for`, `while`, and `except` statements
+* `except` changed into `catch`
+* `elif` changed into `else if`
 
 Usage: `PythonEmbrace.exe file.py`