Initial cleaning up in compiler, fixing bugs
[iot2.git] / iotjava / iotpolicy / IoTCompiler.java
index 757327707c9eebb08ef8a88c88c92918a69280fc..4450f1d3c74a7e39b0a00069a92c158e9bb266cc 100644 (file)
@@ -3,8 +3,11 @@ package iotpolicy;
 import java_cup.runtime.ComplexSymbolFactory;
 import java_cup.runtime.ScannerBuffer;
 import java.io.*;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -14,12 +17,17 @@ import iotpolicy.parser.Parser;
 import iotpolicy.tree.ParseNode;
 import iotpolicy.tree.ParseNodeVector;
 import iotpolicy.tree.ParseTreeHandler;
+import iotpolicy.tree.Declaration;
+import iotpolicy.tree.DeclarationHandler;
 import iotpolicy.tree.CapabilityDecl;
 import iotpolicy.tree.InterfaceDecl;
 import iotpolicy.tree.RequiresDecl;
 
-/** Class IoTCompiler is the main stub compiler for
- *  stub files generation. This class calls helper classes
+import iotrmi.Java.IoTRMITypes;
+
+
+/** Class IoTCompiler is the main interface/stub compiler for
+ *  files generation. This class calls helper classes
  *  such as Parser, Lexer, InterfaceDecl, CapabilityDecl,
  *  RequiresDecl, ParseTreeHandler, etc.
  *
@@ -32,53 +40,54 @@ public class IoTCompiler {
        /**
         * Class properties
         */
-       private String origInt;
-       private ParseTreeHandler ptHandler;
-       private InterfaceDecl intDecl;
-       private CapabilityDecl capDecl;
-       private RequiresDecl reqDecl;
-       private Map<String,Set<String>> mapCapabMethods;
+       // Maps multiple interfaces to multiple objects of ParseTreeHandler
+       private Map<String,ParseTreeHandler> mapIntfacePTH;
+       private Map<String,DeclarationHandler> mapIntDeclHand;
+       private Map<String,Map<String,Set<String>>> mapInt2NewInts;
+       // Data structure to store our types (primitives and non-primitives) for compilation
+       private Map<String,String> mapPrimitives;
+       private Map<String,String> mapNonPrimitivesJava;
+       private Map<String,String> mapNonPrimitivesCplus;
        private PrintWriter pw;
        private String dir;
+       private String subdir;
 
        /**
         * Class constants
         */
-       private final static String OUTPUT_DIRECTORY = "stubfiles";
+       private final static String OUTPUT_DIRECTORY = "output_files";
+
+       private enum ParamCategory {
+
+               PRIMITIVES,             // All the primitive types, e.g. byte, short, int, long, etc.
+               NONPRIMITIVES,  // Non-primitive types, e.g. Set, Map, List, etc.
+               USERDEFINED             // Non-supported type by default; assumed as driver classes
+       }
 
        /**
         * Class constructors
         */
        public IoTCompiler() {
 
-               origInt = null;
-               ptHandler = new ParseTreeHandler();
-               intDecl = null;
-               capDecl = null;
-               capDecl = null;
-               mapCapabMethods = new HashMap<String,Set<String>>();
-               pw = null;
-               dir = OUTPUT_DIRECTORY;
-       }
-
-
-       public IoTCompiler(String _origInt, ParseNode _pnPol, ParseNode _pnReq) {
-
-               origInt = _origInt;
-               ptHandler = new ParseTreeHandler(_origInt, _pnPol, _pnReq);
-               intDecl = null;
-               capDecl = null;
-               reqDecl = null;
-               mapCapabMethods = new HashMap<String,Set<String>>();
+               mapIntfacePTH = new HashMap<String,ParseTreeHandler>();
+               mapIntDeclHand = new HashMap<String,DeclarationHandler>();
+               mapInt2NewInts = new HashMap<String,Map<String,Set<String>>>();
+               mapPrimitives = new HashMap<String,String>();
+                       arraysToMap(mapPrimitives, IoTRMITypes.primitivesJava, IoTRMITypes.primitivesCplus);
+               mapNonPrimitivesJava = new HashMap<String,String>();
+                       arraysToMap(mapNonPrimitivesJava, IoTRMITypes.nonPrimitivesJava, IoTRMITypes.nonPrimitiveJavaLibs);
+               mapNonPrimitivesCplus = new HashMap<String,String>();
+                       arraysToMap(mapNonPrimitivesCplus, IoTRMITypes.nonPrimitivesJava, IoTRMITypes.nonPrimitivesCplus);
                pw = null;
                dir = OUTPUT_DIRECTORY;
+               subdir = null;
        }
 
 
        /**
-        * parsePolicyFile() parses policy file
+        * setParseTree() sets parse tree based on policy files.
         * <p>
-        * It also generates parse tree and
+        * It also generates parse tree (ParseTreeHandler) and
         * copies useful information from parse tree into
         * InterfaceDecl, CapabilityDecl, and RequiresDecl 
         * data structures.
@@ -86,16 +95,24 @@ public class IoTCompiler {
         * returned from tree-parsing for further process.
         *
         */
-       public void parsePolicyFile() {
+       public void setParseTree(String origInt, ParseNode pnPol, ParseNode pnReq) {
 
-               ptHandler.processInterfaceDecl();
-               intDecl = ptHandler.getInterfaceDecl();
+               ParseTreeHandler ptHandler = new ParseTreeHandler(origInt, pnPol, pnReq);
+               DeclarationHandler decHandler = new DeclarationHandler();
 
+               // Process ParseNode and generate Declaration objects
+               ptHandler.processInterfaceDecl();
+               InterfaceDecl intDecl = ptHandler.getInterfaceDecl();
+               decHandler.addInterfaceDecl(origInt, intDecl);
                ptHandler.processCapabilityDecl();
-               capDecl = ptHandler.getCapabilityDecl();
-
+               CapabilityDecl capDecl = ptHandler.getCapabilityDecl();
+               decHandler.addCapabilityDecl(origInt, capDecl);
                ptHandler.processRequiresDecl();
-               reqDecl = ptHandler.getRequiresDecl();
+               RequiresDecl reqDecl = ptHandler.getRequiresDecl();
+               decHandler.addRequiresDecl(origInt, reqDecl);
+
+               mapIntfacePTH.put(origInt, ptHandler);
+               mapIntDeclHand.put(origInt, decHandler);
        }
 
 
@@ -105,11 +122,15 @@ public class IoTCompiler {
         * It is going to give list of methods for a certain interface
         *              based on the declaration of capabilities.
         */
-       public void getMethodsForIntface() {
+       public void getMethodsForIntface(String origInt) {
 
+               ParseTreeHandler ptHandler = mapIntfacePTH.get(origInt);
+               Map<String,Set<String>> mapNewIntMethods = new HashMap<String,Set<String>>();
                // Get set of new interfaces, e.g. CameraWithCaptureAndData
                // Generate this new interface with all the methods it needs
                //              from different capabilities it declares
+               DeclarationHandler decHandler = mapIntDeclHand.get(origInt);
+               RequiresDecl reqDecl = (RequiresDecl) decHandler.getRequiresDecl(origInt);
                Set<String> setIntfaces = reqDecl.getInterfaces();
                for (String strInt : setIntfaces) {
 
@@ -120,6 +141,7 @@ public class IoTCompiler {
                        for (String strCap : listCapab) {
 
                                // Get list of methods for each capability
+                               CapabilityDecl capDecl = (CapabilityDecl) decHandler.getCapabilityDecl(origInt);
                                List<String> listCapabMeth = capDecl.getMethods(strCap);
                                for (String strMeth : listCapabMeth) {
 
@@ -130,38 +152,50 @@ public class IoTCompiler {
                                }
                        }
                        // Add interface and methods information into map
-                       mapCapabMethods.put(strInt, setMethods);
+                       mapNewIntMethods.put(strInt, setMethods);
                }
+               // Map the map of interface-methods to the original interface
+               mapInt2NewInts.put(origInt, mapNewIntMethods);
        }
 
 
        /**
-        * generateJavaInterfaces() generate stub interfaces based on the methods list in Java
+        * generateJavaLocalInterface() writes the local interface and provides type-checking.
+        * <p>
+        * It needs to rewrite and exchange USERDEFINED types in input parameters of stub
+        * and original interfaces, e.g. exchange Camera and CameraWithVideoAndRecording.
+        * The local interface has to be the input parameter for the stub and the stub 
+        * interface has to be the input parameter for the local class.
         */
-       public void generateJavaInterfaces() throws IOException {
+       public void generateJavaLocalInterfaces() throws IOException {
 
                // Create a new directory
                createDirectory(dir);
-               for (Map.Entry<String,Set<String>> intMeth : mapCapabMethods.entrySet()) {
-
+               for (String intface : mapIntfacePTH.keySet()) {
                        // Open a new file to write into
-                       String newIntface = intMeth.getKey();
-                       FileWriter fw = new FileWriter(dir + "/" + newIntface + ".java");
+                       FileWriter fw = new FileWriter(dir + "/" + intface + ".java");
                        pw = new PrintWriter(new BufferedWriter(fw));
+                       // Pass in set of methods and get import classes
+                       DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+                       InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface);
+                       List<String> methods = intDecl.getMethods();
+                       Set<String> importClasses = getImportClasses(methods, intDecl);
+                       printImportStatements(importClasses);
                        // Write interface header
                        println("");
-                       println("public interface " + newIntface + " {");
-                       List<String> meths = intDecl.getMethods();
-
+                       println("public interface " + intface + " {");
                        // Write methods
-                       for (String method : intMeth.getValue()) {
+                       for (String method : methods) {
 
                                List<String> methParams = intDecl.getMethodParams(method);
                                List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
                                print("public " + intDecl.getMethodType(method) + " " +
                                        intDecl.getMethodId(method) + "(");
                                for (int i = 0; i < methParams.size(); i++) {
-                                        print(methPrmTypes.get(i) + " " + methParams.get(i));
+                                       // Check for params with driver class types and exchange it 
+                                       //              with its remote interface
+                                       String paramType = checkAndGetParamClass(methPrmTypes.get(i), false);
+                                       print(paramType + " " + methParams.get(i));
                                        // Check if this is the last element (don't print a comma)
                                        if (i != methParams.size() - 1) {
                                                print(", ");
@@ -171,43 +205,60 @@ public class IoTCompiler {
                        }
                        println("}");
                        pw.close();
-                       System.out.println("IoTCompiler: Generated interface " + newIntface + ".java...");
+                       System.out.println("IoTCompiler: Generated local interface " + intface + ".java...");
                }
        }
 
 
        /**
-        * generateCPlusInterfaces() generate stub interfaces based on the methods list in C++
+        * generateCplusLocalInterfaces() writes the local interfaces and provides type-checking.
         * <p>
-        * For C++ we use virtual classe as interface
+        * It needs to rewrite and exchange USERDEFINED types in input parameters of stub
+        * and original interfaces, e.g. exchange Camera and CameraWithVideoAndRecording.
+        * The local interface has to be the input parameter for the stub and the stub 
+        * interface has to be the input parameter for the local class.
         */
-       public void generateCPlusInterfaces() throws IOException {
+       public void generateCplusLocalInterfaces() throws IOException {
 
                // Create a new directory
                createDirectory(dir);
-               for (Map.Entry<String,Set<String>> intMeth : mapCapabMethods.entrySet()) {
-
+               for (String intface : mapIntfacePTH.keySet()) {
                        // Open a new file to write into
-                       String newIntface = intMeth.getKey();
-                       FileWriter fw = new FileWriter(dir + "/" + newIntface + ".hpp");
+                       FileWriter fw = new FileWriter(dir + "/" + intface + ".hpp");
                        pw = new PrintWriter(new BufferedWriter(fw));
                        // Write file headers
-                       println("#include<iostream>");
+                       println("#include <iostream>");
+                       // Pass in set of methods and get include classes
+                       DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+                       InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface);
+                       List<String> methods = intDecl.getMethods();
+
+                       // DEBUGGG
+                       Set<String> includeClasses = getIncludeClasses(methods, intDecl);
+
+                       printIncludeStatements(includeClasses);
                        println("");
                        println("using namespace std;");
                        println("");
-                       println("class " + newIntface);
+                       println("class " + intface);
                        println("{");
                        println("public:");
                        // Write methods
-                       for (String method : intMeth.getValue()) {
+                       for (String method : methods) {
 
                                List<String> methParams = intDecl.getMethodParams(method);
                                List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
                                print("virtual " + convertType(intDecl.getMethodType(method)) + " " +
                                        intDecl.getMethodId(method) + "(");
                                for (int i = 0; i < methParams.size(); i++) {
-                                        print(convertType(methPrmTypes.get(i)) + " " + methParams.get(i));
+                                       // Check for params with driver class types and exchange it 
+                                       //              with its remote interface
+                                       String paramType = checkAndGetParamClass(methPrmTypes.get(i), true);
+                                       paramType = checkAndGetCplusType(paramType);
+                                       // Check for arrays - translate into vector in C++
+                                       String paramComplete = checkAndGetCplusArray(paramType, methParams.get(i));
+                                       //print(paramType + " " + param);
+                                       print(paramComplete);
                                        // Check if this is the last element (don't print a comma)
                                        if (i != methParams.size() - 1) {
                                                print(", ");
@@ -218,55 +269,174 @@ public class IoTCompiler {
                        print("}");
                        println(";");
                        pw.close();
-                       System.out.println("IoTCompiler: Generated interface " + newIntface + ".hpp...");
+                       System.out.println("IoTCompiler: Generated local interface " + intface + ".hpp...");
                }
        }
 
 
        /**
-        * generateJavaStubClasses() generate stubs based on the methods list in Java
+        * generateJavaInterfaces() generate stub interfaces based on the methods list in Java
         */
-       public void generateJavaStubClasses() throws IOException {
+       public void generateJavaInterfaces() throws IOException {
 
                // Create a new directory
-               createDirectory(dir);
-               for (Map.Entry<String,Set<String>> intMeth : mapCapabMethods.entrySet()) {
+               String path = createDirectories(dir, subdir);
+               for (String intface : mapIntfacePTH.keySet()) {
+
+                       Map<String,Set<String>> mapNewIntMethods = mapInt2NewInts.get(intface);
+                       for (Map.Entry<String,Set<String>> intMeth : mapNewIntMethods.entrySet()) {
+
+                               // Open a new file to write into
+                               String newIntface = intMeth.getKey();
+                               FileWriter fw = new FileWriter(path + "/" + newIntface + ".java");
+                               pw = new PrintWriter(new BufferedWriter(fw));
+                               DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+                               InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface);
+                               // Pass in set of methods and get import classes
+                               Set<String> importClasses = getImportClasses(intMeth.getValue(), intDecl);
+                               printImportStatements(importClasses);
+                               // Write interface header
+                               println("");
+                               println("public interface " + newIntface + " {");
+                               List<String> meths = intDecl.getMethods();
+                               // Write methods
+                               for (String method : intMeth.getValue()) {
+
+                                       List<String> methParams = intDecl.getMethodParams(method);
+                                       List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
+                                       print("public " + intDecl.getMethodType(method) + " " +
+                                               intDecl.getMethodId(method) + "(");
+                                       for (int i = 0; i < methParams.size(); i++) {
+                                               String paramType = checkAndGetParamClass(methPrmTypes.get(i), false);
+                                               print(paramType + " " + methParams.get(i));
+                                               //print(methPrmTypes.get(i) + " " + methParams.get(i));
+                                               // Check if this is the last element (don't print a comma)
+                                               if (i != methParams.size() - 1) {
+                                                       print(", ");
+                                               }
+                                       }
+                                       println(");");
+                               }
+                               println("}");
+                               pw.close();
+                               System.out.println("IoTCompiler: Generated interface " + newIntface + ".java...");
+                       }
+               }
+       }
 
-                       // Open a new file to write into
-                       String newIntface = intMeth.getKey();
-                       String newStubClass = newIntface + "_Stub";
-                       FileWriter fw = new FileWriter(dir + "/" + newStubClass + ".java");
-                       pw = new PrintWriter(new BufferedWriter(fw));
-                       // Write interface header
-                       println("");
-                       println("public class " + newStubClass + " implements " + newIntface + " {");
-                       println("");
-                       // Write methods
-                       for (String method : intMeth.getValue()) {
 
-                               List<String> methParams = intDecl.getMethodParams(method);
-                               List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
-                               print("public " + intDecl.getMethodType(method) + " " +
-                                       intDecl.getMethodId(method) + "(");
-                               for (int i = 0; i < methParams.size(); i++) {
-                                        print(methPrmTypes.get(i) + " " + methParams.get(i));
-                                       // Check if this is the last element (don't print a comma)
-                                       if (i != methParams.size() - 1) {
-                                               print(", ");
+       /**
+        * generateCPlusInterfaces() generate stub interfaces based on the methods list in C++
+        * <p>
+        * For C++ we use virtual classe as interface
+        */
+       public void generateCPlusInterfaces() throws IOException {
+
+               // Create a new directory
+               String path = createDirectories(dir, subdir);
+               for (String intface : mapIntfacePTH.keySet()) {
+
+                       Map<String,Set<String>> mapNewIntMethods = mapInt2NewInts.get(intface);
+                       for (Map.Entry<String,Set<String>> intMeth : mapNewIntMethods.entrySet()) {
+
+                               // Open a new file to write into
+                               String newIntface = intMeth.getKey();
+                               FileWriter fw = new FileWriter(path + "/" + newIntface + ".hpp");
+                               pw = new PrintWriter(new BufferedWriter(fw));
+                               DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+                               InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface);
+                               // Write file headers
+                               println("#include <iostream>");
+                               // Pass in set of methods and get import classes
+                               Set<String> includeClasses = getIncludeClasses(intMeth.getValue(), intDecl);
+                               printIncludeStatements(includeClasses);
+                               println("");
+                               println("using namespace std;");
+                               println("");
+                               println("class " + newIntface);
+                               println("{");
+                               println("public:");
+                               // Write methods
+                               for (String method : intMeth.getValue()) {
+
+                                       List<String> methParams = intDecl.getMethodParams(method);
+                                       List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
+                                       print("virtual " + convertType(intDecl.getMethodType(method)) + " " +
+                                               intDecl.getMethodId(method) + "(");
+                                       for (int i = 0; i < methParams.size(); i++) {
+                                               String methPrmType = checkAndGetParamClass(methPrmTypes.get(i), true);
+                                               methPrmType = checkAndGetCplusType(methPrmType);
+                                               String methParamComplete = checkAndGetCplusArray(methPrmType, methParams.get(i));
+                                               print(methParamComplete);
+                                               // Check if this is the last element (don't print a comma)
+                                               if (i != methParams.size() - 1) {
+                                                       print(", ");
+                                               }
                                        }
+                                       println(") = 0;");
                                }
-                               println(") {");
-                               // Check if this is not "void"
-                               if (!intDecl.getMethodType(method).equals("void")) {
-                                       String retStmt = generateReturnStmt(intDecl.getMethodType(method));
-                                       println("return " + retStmt + ";");
+                               print("}");
+                               println(";");
+                               pw.close();
+                               System.out.println("IoTCompiler: Generated interface " + newIntface + ".hpp...");
+                       }
+               }
+       }
+
+
+       /**
+        * generateJavaStubClasses() generate stubs based on the methods list in Java
+        */
+       public void generateJavaStubClasses() throws IOException {
+
+               // Create a new directory
+               String path = createDirectories(dir, subdir);
+               for (String intface : mapIntfacePTH.keySet()) {
+
+                       Map<String,Set<String>> mapNewIntMethods = mapInt2NewInts.get(intface);
+                       for (Map.Entry<String,Set<String>> intMeth : mapNewIntMethods.entrySet()) {
+
+                               // Open a new file to write into
+                               String newIntface = intMeth.getKey();
+                               String newStubClass = newIntface + "_Stub";
+                               FileWriter fw = new FileWriter(path + "/" + newStubClass + ".java");
+                               pw = new PrintWriter(new BufferedWriter(fw));
+                               DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+                               InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface);
+                               // Pass in set of methods and get import classes
+                               Set<String> importClasses = getImportClasses(intMeth.getValue(), intDecl);
+                               printImportStatements(importClasses);
+                               // Write interface header
+                               println("");
+                               println("public class " + newStubClass + " implements " + newIntface + " {");
+                               println("");
+                               // Write methods
+                               for (String method : intMeth.getValue()) {
+
+                                       List<String> methParams = intDecl.getMethodParams(method);
+                                       List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
+                                       print("public " + intDecl.getMethodType(method) + " " +
+                                               intDecl.getMethodId(method) + "(");
+                                       for (int i = 0; i < methParams.size(); i++) {
+
+                                               print(methPrmTypes.get(i) + " " + methParams.get(i));
+                                               // Check if this is the last element (don't print a comma)
+                                               if (i != methParams.size() - 1) {
+                                                       print(", ");
+                                               }
+                                       }
+                                       println(") {");
+                                       // Check if this is not "void"
+                                       if (!intDecl.getMethodType(method).equals("void")) {
+                                               String retStmt = generateReturnStmt(intDecl.getMethodType(method));
+                                               println("return " + retStmt + ";");
+                                       }
+                                       println("}"); println("");
                                }
                                println("}");
-                               println("");
+                               pw.close();
+                               System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".java...");
                        }
-                       println("}");
-                       pw.close();
-                       System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".java...");
                }
        }
 
@@ -277,52 +447,58 @@ public class IoTCompiler {
        public void generateCPlusStubClasses() throws IOException {
 
                // Create a new directory
-               createDirectory(dir);
-               for (Map.Entry<String,Set<String>> intMeth : mapCapabMethods.entrySet()) {
-
-                       // Open a new file to write into
-                       String newIntface = intMeth.getKey();
-                       String newStubClass = newIntface + "_Stub";
-                       FileWriter fw = new FileWriter(dir + "/" + newStubClass + ".hpp");
-                       pw = new PrintWriter(new BufferedWriter(fw));
-                       // Write file headers
-                       println("#include<iostream>");
-                       println("#include \"" + newIntface + ".hpp\""); println("");            
-                       println("using namespace std;"); println("");
-                       println("class " + newStubClass + " : public " + newIntface);
-                       println("{");
-                       println("public:"); println("");
-                       // Add default constructor and destructor
-                       println(newStubClass + "() { }"); println("");
-                       println("~" + newStubClass + "() { }"); println("");            
-                       // Write methods
-                       for (String method : intMeth.getValue()) {
-
-                               List<String> methParams = intDecl.getMethodParams(method);
-                               List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
-                               print(convertType(intDecl.getMethodType(method)) + " " +
-                                       intDecl.getMethodId(method) + "(");
-                               for (int i = 0; i < methParams.size(); i++) {
-                                        print(convertType(methPrmTypes.get(i)) + " " + methParams.get(i));
-                                       // Check if this is the last element (don't print a comma)
-                                       if (i != methParams.size() - 1) {
-                                               print(", ");
+               String path = createDirectories(dir, subdir);
+               for (String intface : mapIntfacePTH.keySet()) {
+
+                       Map<String,Set<String>> mapNewIntMethods = mapInt2NewInts.get(intface);
+                       for (Map.Entry<String,Set<String>> intMeth : mapNewIntMethods.entrySet()) {
+                               // Open a new file to write into
+                               String newIntface = intMeth.getKey();
+                               String newStubClass = newIntface + "_Stub";
+                               FileWriter fw = new FileWriter(path + "/" + newStubClass + ".hpp");
+                               pw = new PrintWriter(new BufferedWriter(fw));
+                               // Write file headers
+                               println("#include <iostream>");
+                               println("#include \"" + newIntface + ".hpp\""); println("");            
+                               println("using namespace std;"); println("");
+                               println("class " + newStubClass + " : public " + newIntface); println("{");
+                               println("public:"); println("");
+                               // Add default constructor and destructor
+                               println(newStubClass + "() { }"); println("");
+                               println("~" + newStubClass + "() { }"); println("");
+                               DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+                               InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface);
+                               // Write methods
+                               for (String method : intMeth.getValue()) {
+
+                                       List<String> methParams = intDecl.getMethodParams(method);
+                                       List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
+                                       print(convertType(intDecl.getMethodType(method)) + " " +
+                                               intDecl.getMethodId(method) + "(");
+                                       for (int i = 0; i < methParams.size(); i++) {
+                                               String methPrmType = checkAndGetCplusType(methPrmTypes.get(i));
+                                               String methParamComplete = checkAndGetCplusArray(methPrmType, methParams.get(i));
+                                               print(methParamComplete);
+                                               // Check if this is the last element (don't print a comma)
+                                               if (i != methParams.size() - 1) {
+                                                       print(", ");
+                                               }
                                        }
-                               }
-                               println(") { ");
-                               // Check if this is not "void"
-                               if (!intDecl.getMethodType(method).equals("void")) {
-                                       String retStmt = generateReturnStmt(intDecl.getMethodType(method));
-                                       if (retStmt.equals("null")) { // null = NULL in C++
-                                               retStmt = "NULL";
+                                       println(") { ");
+                                       // Check if this is not "void"
+                                       if (!intDecl.getMethodType(method).equals("void")) {
+                                               String retStmt = generateReturnStmt(intDecl.getMethodType(method));
+                                               if (retStmt.equals("null")) { // null = NULL in C++
+                                                       retStmt = "NULL";
+                                               }
+                                               println("return " + retStmt + ";");
                                        }
-                                       println("return " + retStmt + ";");
+                                       println("}"); println("");
                                }
-                               println("}"); println("");
+                               print("}"); println(";");
+                               pw.close();
+                               System.out.println("IoTCompiler: Generated stub class " + newIntface + ".hpp...");
                        }
-                       print("}"); println(";");
-                       pw.close();
-                       System.out.println("IoTCompiler: Generated stub class " + newIntface + ".hpp...");
                }
        }
 
@@ -340,11 +516,11 @@ public class IoTCompiler {
                        methType.equals("double")) {
 
                        return "1";
-               } else if ( methType.equals("String") ||
-                                       methType.equals("byte")) {
+               } else if ( methType.equals("String")) {
   
                        return "\"a\"";
-               } else if ( methType.equals("char")) {
+               } else if ( methType.equals("char") ||
+                                       methType.equals("byte")) {
 
                        return "\'a\'";
                } else if ( methType.equals("boolean")) {
@@ -357,11 +533,11 @@ public class IoTCompiler {
 
 
        /**
-        * setDirectory() set a new directory for stub files
+        * setDirectory() sets a new directory for stub files
         */
-       public void setDirectory(String _dir) {
+       public void setDirectory(String _subdir) {
 
-               dir = _dir;
+               subdir = _subdir;
        }
 
 
@@ -375,9 +551,11 @@ public class IoTCompiler {
                System.out.println("Copyright (c) 2015-2016 University of California, Irvine - Programming Language Group.");
                System.out.println("All rights reserved.");
                System.out.println("Usage:");
-               System.out.println("\tjava IoTCompiler --help / -h\t\t\t\t\tDisplay this help texts");
-               System.out.println("\tjava IoTCompiler <main-policy-file> <req-policy-file>\t\tGenerate both Java and C++ stub files");
-               System.out.println("\tjava IoTCompiler <main-policy-file> <req-policy-file> [options]");
+               System.out.println("\tjava IoTCompiler -help / --help / -h\n");
+               System.out.println("\t\tDisplay this help texts\n\n");
+               System.out.println("\tjava IoTCompiler [<main-policy-file> <req-policy-file>]");
+               System.out.println("\tjava IoTCompiler [<main-policy-file> <req-policy-file>] [options]\n");
+               System.out.println("\t\tTake one or more pairs of main-req policy files, and generate Java and/or C++ files\n");
                System.out.println("Options:");
                System.out.println("\t-java\t<directory>\tGenerate Java stub files");
                System.out.println("\t-cplus\t<directory>\tGenerate C++ stub files");
@@ -385,9 +563,30 @@ public class IoTCompiler {
        }
 
 
-       /**================================================
-        * Helper functions to write stub codes into files
-        **================================================
+       /**
+        * parseFile() prepares Lexer and Parser objects, then parses the file
+        */
+       public static ParseNode parseFile(String file) {
+
+               ParseNode pn = null;
+               try {
+                       ComplexSymbolFactory csf = new ComplexSymbolFactory();
+                       ScannerBuffer lexer = 
+                               new ScannerBuffer(new Lexer(new BufferedReader(new FileReader(file)),csf));
+                       Parser parse = new Parser(lexer,csf);
+                       pn = (ParseNode) parse.parse().value;
+               } catch (Exception e) {
+                       e.printStackTrace();
+                       throw new Error("IoTCompiler: ERROR parsing policy file or wrong command line option: " + file);
+               }
+
+               return pn;
+       }
+
+
+       /**================
+        * Helper functions
+        **================
         */
        boolean newline=true;
        int tablevel=0;
@@ -410,27 +609,7 @@ public class IoTCompiler {
         */
        private String convertType(String jType) {
 
-               // Generate dummy returns for now
-               if (jType.equals("short")||
-                       jType.equals("int")  ||
-                       jType.equals("long") ||
-                       jType.equals("char") ||
-                       jType.equals("float")||
-                       jType.equals("double")) {
-
-                       return jType;
-               } else if ( jType.equals("String")) {
-  
-                       return "string";
-               } else if ( jType.equals("byte")) {
-
-                       return "char";
-               } else if ( jType.equals("boolean")) {
-
-                       return "bool";
-               } else {
-                       return jType;
-               }       
+               return mapPrimitives.get(jType);
        }
 
 
@@ -479,63 +658,300 @@ public class IoTCompiler {
        }
 
 
-       public static void main(String[] args) throws Exception {
+       // Create a directory and possibly a sub directory
+       private String createDirectories(String dir, String subdir) {
+
+               String path = dir;
+               createDirectory(path);
+               if (subdir != null) {
+                       path = path + "/" + subdir;
+                       createDirectory(path);
+               }
+               return path;
+       }
+
+
+       // Inserting array members into a Map object
+       // that maps arrKey to arrVal objects
+       private void arraysToMap(Map map, Object[] arrKey, Object[] arrVal) {
+
+               for(int i = 0; i < arrKey.length; i++) {
+
+                       map.put(arrKey[i], arrVal[i]);
+               }
+       }
+
+
+       // Return parameter category, i.e. PRIMITIVES, NONPRIMITIVES, or USERDEFINED
+       private ParamCategory getParamCategory(String paramType) {
+
+               if (mapPrimitives.containsKey(paramType)) {
+                       return ParamCategory.PRIMITIVES;
+               // We can either use mapNonPrimitivesJava or mapNonPrimitivesCplus here
+               } else if (mapNonPrimitivesJava.containsKey(getSimpleType(paramType))) {
+                       return ParamCategory.NONPRIMITIVES;
+               } else
+                       return ParamCategory.USERDEFINED;
+       }
+
+
+       // Return full class name for non-primitives to generate Java import statements
+       // e.g. java.util.Set for Set, java.util.Map for Map
+       private String getNonPrimitiveJavaClass(String paramNonPrimitives) {
+
+               return mapNonPrimitivesJava.get(paramNonPrimitives);
+       }
+
+
+       // Return full class name for non-primitives to generate Cplus include statements
+       // e.g. #include <set> for Set, #include <map> for Map
+       private String getNonPrimitiveCplusClass(String paramNonPrimitives) {
+
+               return mapNonPrimitivesCplus.get(paramNonPrimitives);
+       }
+
+
+       // Get simple types, e.g. HashSet for HashSet<...>
+       // Basically strip off the "<...>"
+       private String getSimpleType(String paramType) {
+
+               // Check if this is generics
+               if(paramType.contains("<")) {
+                       String[] type = paramType.split("<");
+                       return type[0];
+               } else
+                       return paramType;
+       }
+
+
+       // Generate a set of classes for import statements
+       private Set<String> getImportClasses(Collection<String> methods, InterfaceDecl intDecl) {
+
+               Set<String> importClasses = new HashSet<String>();
+               for (String method : methods) {
+                       List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
+                       for (String paramType : methPrmTypes) {
+
+                               String simpleType = getSimpleType(paramType);
+                               if (getParamCategory(simpleType) == ParamCategory.NONPRIMITIVES) {
+                                       importClasses.add(getNonPrimitiveJavaClass(simpleType));
+                               }
+                       }
+               }
+               return importClasses;
+       }
+
+
+       // Generate a set of classes for include statements
+       private Set<String> getIncludeClasses(Collection<String> methods, InterfaceDecl intDecl) {
+
+               Set<String> includeClasses = new HashSet<String>();
+               for (String method : methods) {
 
-               // Runtime options
-               if (args.length != 0) {
-                       // Display help
-                       if ((args[0].equals("--help") ||
-                               (args[0].equals("-h")))) {
-                               IoTCompiler.printUsage();
+                       List<String> methPrmTypes = intDecl.getMethodParamTypes(method);
+                       List<String> methParams = intDecl.getMethodParams(method);
+                       for (int i = 0; i < methPrmTypes.size(); i++) {
+
+                               String simpleType = getSimpleType(methPrmTypes.get(i));
+                               String param = methParams.get(i);
+                               if (getParamCategory(simpleType) == ParamCategory.NONPRIMITIVES) {
+                                       includeClasses.add("<" + getNonPrimitiveCplusClass(simpleType) + ">");
+                               } else if (getParamCategory(simpleType) == ParamCategory.USERDEFINED) {
+                                       includeClasses.add("\"" + exchangeParamType(simpleType) + ".hpp\"");
+                               } else if (param.contains("[]")) {
+                               // Check if this is array for C++; translate into vector
+                                       includeClasses.add("<vector>");
+                               }
+                       }
+               }
+               return includeClasses;
+       }
+
+
+       private void printImportStatements(Set<String> importClasses) {
+
+               for(String cls : importClasses) {
+                       println("import " + cls + ";");
+               }
+       }
+
+
+       private void printIncludeStatements(Set<String> includeClasses) {
+
+               for(String cls : includeClasses) {
+                       println("#include " + cls);
+               }
+       }
+
+
+       // Get the C++ version of a non-primitive type
+       // e.g. set for Set and map for Map
+       // Input nonPrimitiveType has to be generics in format
+       private String[] getTypeOfGeneric(String nonPrimitiveType) {
+
+               // Handle <, >, and , for 2-type generic/template
+               String[] substr = nonPrimitiveType.split("<")[1].split(">")[0].split(",");
+               return substr;
+       }
+
+
+       private String checkAndGetCplusType(String paramType) {
+
+               if (getParamCategory(paramType) == ParamCategory.PRIMITIVES) {
+                       return convertType(paramType);
+               } else if (getParamCategory(paramType) == ParamCategory.NONPRIMITIVES) {
+
+                       // Check for generic/template format
+                       if (paramType.contains("<") && paramType.contains(">")) {
+
+                               String genericClass = getSimpleType(paramType);
+                               String[] genericType = getTypeOfGeneric(paramType);
+                               String cplusTemplate = null;
+                               if (genericType.length == 1) // Generic/template with one type
+                                       cplusTemplate = getNonPrimitiveCplusClass(genericClass) + 
+                                               "<" + convertType(genericType[0]) + ">";
+                               else // Generic/template with two types
+                                       cplusTemplate = getNonPrimitiveCplusClass(genericClass) + 
+                                               "<" + convertType(genericType[0]) + "," + convertType(genericType[1]) + ">";
+                               return cplusTemplate;
+                       } else
+                               return getNonPrimitiveCplusClass(paramType);
+               } else
+                       // Just return it as is if it's not non-primitives
+                       return paramType;
+       }
+
+
+       // Detect array declaration, e.g. int A[],
+       //              then generate "int A[]" in C++ as "vector<int> A"
+       private String checkAndGetCplusArray(String paramType, String param) {
+
+               String paramComplete = null;
+               // Check for array declaration
+               if (param.contains("[]")) {
+                       paramComplete = "vector<" + paramType + "> " + param.replace("[]","");
+               } else
+                       // Just return it as is if it's not an array
+                       paramComplete = paramType + " " + param;
+
+               return paramComplete;
+       }
+
+
+       // Get simple types, e.g. HashSet for HashSet<...>
+       // Basically strip off the "<...>"
+       private String checkAndGetParamClass(String paramType, boolean needPtr) {
+
+               // Check if this is generics
+               if(getParamCategory(paramType) == ParamCategory.USERDEFINED) {
+                       // If true then return with pointer (C++)
+                       if (needPtr)
+                               return exchangeParamType(paramType) + "*";
+                       else    // Java, so no pointer needed
+                               return exchangeParamType(paramType);
+               } else
+                       return paramType;
+       }
+
+
+       // Returns the other interface for type-checking purposes for USERDEFINED
+       //              classes based on the information provided in multiple policy files
+       // e.g. return CameraWithXXX instead of Camera
+       private String exchangeParamType(String intface) {
+
+               // Param type that's passed is the interface name we need to look for
+               //              in the map of interfaces, based on available policy files.
+               DeclarationHandler decHandler = mapIntDeclHand.get(intface);
+               if (decHandler != null) {
+               // We've found the required interface policy files
+                       RequiresDecl reqDecl = (RequiresDecl) decHandler.getRequiresDecl(intface);
+                       Set<String> setExchInt = reqDecl.getInterfaces();
+                       if (setExchInt.size() == 1) {
+                               Iterator iter = setExchInt.iterator();
+                               return (String) iter.next();
                        } else {
+                               throw new Error("IoTCompiler: Ambiguous stub interfaces: " + setExchInt.toString() + 
+                                       ". Only one new interface can be declared if the object " + intface +
+                                       " needs to be passed in as an input parameter!");
+                       }
+               } else {
+               // NULL value - this means policy files missing
+                       throw new Error("IoTCompiler: Parameter type lookup failed for " + intface +
+                               "... Please provide the necessary policy files for user-defined types." +
+                               " If this is an array please type the brackets after the variable name," +
+                               " e.g. \"String str[]\", not \"String[] str\"." +
+                               " If this is a Collections (Java) / STL (C++) type, this compiler only" +
+                               " supports List/ArrayList (Java) or list (C++).");
+               }
+       }
+
+
+       public static void main(String[] args) throws Exception {
+
+               // If there is no argument or just "--help" or "-h", then invoke printUsage()
+               if ((args[0].equals("-help") ||
+                        args[0].equals("--help")||
+                        args[0].equals("-h"))   ||
+                       (args.length == 0)) {
+
+                       IoTCompiler.printUsage();
+
+               } else if (args.length > 1) {
+
+                       IoTCompiler comp = new IoTCompiler();
+                       int i = 0;                              
+                       do {
                                // Parse main policy file
-                               ComplexSymbolFactory csfPol = new ComplexSymbolFactory();
-                               ScannerBuffer lexerPol = 
-                                       new ScannerBuffer(new Lexer(new BufferedReader(new FileReader(args[0])),csfPol));
-                               Parser parsePol = new Parser(lexerPol,csfPol);
-                               ParseNode pnPol = (ParseNode) parsePol.parse().value;
+                               ParseNode pnPol = IoTCompiler.parseFile(args[i]);
                                // Parse "requires" policy file
-                               ComplexSymbolFactory csfReq = new ComplexSymbolFactory();
-                               ScannerBuffer lexerReq = 
-                                       new ScannerBuffer(new Lexer(new BufferedReader(new FileReader(args[1])),csfReq));
-                               Parser parseReq = new Parser(lexerReq,csfReq);
-                               ParseNode pnReq = (ParseNode) parseReq.parse().value;
+                               ParseNode pnReq = IoTCompiler.parseFile(args[i+1]);
                                // Get interface name
-                               String intFace = ParseTreeHandler.getOrigIntface(pnPol);
-                               //System.out.println("IoTCompiler: Original interface: " + intFace);
-                               IoTCompiler comp = new IoTCompiler(intFace, pnPol, pnReq);
-                               // Generate all policy files if just policy file is provided
-                               comp.parsePolicyFile();
-                               comp.getMethodsForIntface();
-                               if (args.length == 2) {
-                                       comp.generateJavaInterfaces();
-                                       comp.generateJavaStubClasses();
-                                       comp.generateCPlusInterfaces();
-                                       comp.generateCPlusStubClasses();
-                               } else {
-                               // Check other options
-                                       int i = 2;
-                                       while(i < args.length) {
-                                               // Check whether <directory> is provided
-                                               if ((i + 1) < args.length) {
+                               String intface = ParseTreeHandler.getOrigIntface(pnPol);
+                               comp.setParseTree(intface, pnPol, pnReq);
+                               comp.getMethodsForIntface(intface);
+                               i = i + 2;
+                       // 1) Check if this is the last option before "-java" or "-cplus"
+                       // 2) Check if this is really the last option (no "-java" or "-cplus")
+                       } while(!args[i].equals("-java") &&
+                                       !args[i].equals("-cplus") &&
+                                       (i < args.length));
+
+                       // Generate everything if we don't see "-java" or "-cplus"
+                       if (i == args.length) {
+                               comp.generateJavaLocalInterfaces();
+                               comp.generateJavaInterfaces();
+                               comp.generateJavaStubClasses();
+                               comp.generateCplusLocalInterfaces();
+                               comp.generateCPlusInterfaces();
+                               comp.generateCPlusStubClasses();
+                       } else {
+                       // Check other options
+                               while(i < args.length) {
+                                       // Error checking
+                                       if (!args[i].equals("-java") &&
+                                               !args[i].equals("-cplus")) {
+                                               throw new Error("IoTCompiler: ERROR - unrecognized command line option: " + args[i]);
+                                       } else {
+                                               if (i + 1 < args.length) {
                                                        comp.setDirectory(args[i+1]);
                                                } else
                                                        throw new Error("IoTCompiler: ERROR - please provide <directory> after option: " + args[i]);
+
                                                if (args[i].equals("-java")) {
+                                                       comp.generateJavaLocalInterfaces();
                                                        comp.generateJavaInterfaces();
                                                        comp.generateJavaStubClasses();
-                                               } else if (args[i].equals("-cplus")) {
+                                               } else {
+                                                       comp.generateCplusLocalInterfaces();
                                                        comp.generateCPlusInterfaces();
                                                        comp.generateCPlusStubClasses();
-                                               } else
-                                                       throw new Error("IoTCompiler: ERROR - unrecognized command line option: " + args[i]);
-                                               i = i + 2;
+                                               }
                                        }
+                                       i = i + 2;
                                }
                        }
-
                } else {
-               // Need at least the policy file name
+               // Need to at least have exactly 2 parameters, i.e. main policy file and requires file
                        IoTCompiler.printUsage();
                        throw new Error("IoTCompiler: At least two arguments (main and requires policy files) have to be provided!");
                }