Merge branch 'master' of https://github.com/mes258/textToCode

mes258 · mes258 · commit e63c07da94d6 · 2019-05-03T12:31:34.000-04:00
diff --git a/textToCode/textToCode/JavaClass.swift b/textToCode/textToCode/JavaClass.swift
@@ -35,10 +35,6 @@ class JavaClass{
         classVariables.append(JavaVariable.init(name: varName, vis: vis, type: type));
     }
     
-//    func addMethodVar(method: Int, varName: String, vis: String, type: String){
-//        methods[method].addVar(varName: varName, vis: vis, type: type);
-//    }
-    
     func findMethod(_ methodName: String) -> JavaMethod?{
         return methods.first(where: { (m:JavaMethod) -> Bool in
              return m.getName() == methodName
@@ -83,8 +79,6 @@ class JavaClass{
             output.append(formattedVar)
         }
         for xmethod in methods{
-//            var tab = NSMutableAttributedString(string: "\t");
-//            output.append(tab);
             output.append(xmethod.toFormattedString())
         }
         
@@ -94,7 +88,6 @@ class JavaClass{
         if let xclass = SpeechProcessor.state.currentClass{
             if xclass.name == self.name && SpeechProcessor.state.currentMethod == nil{
                 output = NSMutableAttributedString(string: self.toString());
-                
                 output.addAttributes([NSAttributedString.Key.foregroundColor: UIColor.init(red: 0.7, green: 0.0, blue: 1.0, alpha: 1.0)] as [NSAttributedString.Key: Any], range: NSRange(location: 0, length: self.toString().count));
             }
         }
diff --git a/textToCode/textToCode/JavaExpression.swift b/textToCode/textToCode/JavaExpression.swift
@@ -5,13 +5,12 @@
 //  Created by Michael Smith on 4/26/19.
 //  Copyright © 2019 Michael Smith. All rights reserved.
 //
+//  Abstract parent class for control flow, variables, loops, everything else really
+//
 
 import Foundation
 
 class JavaExpression{
-    //Control flow, variables, loops, everything else really
-    //use a set to keep track of key words (declared names in scope)
-    
     
     init() {
         
diff --git a/textToCode/textToCode/JavaMethod.swift b/textToCode/textToCode/JavaMethod.swift
@@ -17,7 +17,6 @@ class JavaMethod{
     var expressions: [JavaExpression] = [];
     private var inStructure = false;
     
-    //Need to account for parameters
     init(name: String, vis: String, returnType: String) {
         self.name = name;
         self.visability = ItemVisability(rawValue: vis) ?? ItemVisability.defaultItem;
diff --git a/textToCode/textToCode/JavaState.swift b/textToCode/textToCode/JavaState.swift
@@ -9,11 +9,9 @@
 import Foundation
 
 class JavaState{
-    //We should make this a singleton or cache it
     var classes: [JavaClass] = [];
     var currentClass: JavaClass? = nil;
     var currentMethod: JavaMethod? = nil;
-    var atline: Int = 0;
     var previousState: JavaState? = nil;
     init() {
         
@@ -110,7 +108,6 @@ class JavaState{
         }
         copy.currentClass = currentClass
         copy.currentMethod = currentMethod
-        copy.atline = atline
         copy.previousState = previousState
         
         return copy

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,6 @@ class JavaClass{`
`35`	`35`	`classVariables.append(JavaVariable.init(name: varName, vis: vis, type: type));`
`36`	`36`	`}`
`37`	`37`
`38`		`-// func addMethodVar(method: Int, varName: String, vis: String, type: String){`
`39`		`-// methods[method].addVar(varName: varName, vis: vis, type: type);`
`40`		`-// }`
`41`		`-`
`42`	`38`	`func findMethod(_ methodName: String) -> JavaMethod?{`
`43`	`39`	`return methods.first(where: { (m:JavaMethod) -> Bool in`
`44`	`40`	`return m.getName() == methodName`
`@@ -83,8 +79,6 @@ class JavaClass{`
`83`	`79`	`output.append(formattedVar)`
`84`	`80`	`}`
`85`	`81`	`for xmethod in methods{`
`86`		`-// var tab = NSMutableAttributedString(string: "\t");`
`87`		`-// output.append(tab);`
`88`	`82`	`output.append(xmethod.toFormattedString())`
`89`	`83`	`}`
`90`	`84`
`@@ -94,7 +88,6 @@ class JavaClass{`
`94`	`88`	`if let xclass = SpeechProcessor.state.currentClass{`
`95`	`89`	`if xclass.name == self.name && SpeechProcessor.state.currentMethod == nil{`
`96`	`90`	`output = NSMutableAttributedString(string: self.toString());`
`97`		`-`
`98`	`91`	`output.addAttributes([NSAttributedString.Key.foregroundColor: UIColor.init(red: 0.7, green: 0.0, blue: 1.0, alpha: 1.0)] as [NSAttributedString.Key: Any], range: NSRange(location: 0, length: self.toString().count));`
`99`	`92`	`}`
`100`	`93`	`}`