Merge pull request #1110 from tbocek/develop

Set NameOnlyOptions as user-based parameters and add GAS option

Author: zilm13

ethereumj-core/src/main/java/org/ethereum/solidity/compiler/SolidityCompiler.java

@@ -151,6 +151,34 @@ private enum OutputOption implements Option {
         }
     }
 
+    public static class CustomOption implements Option {
+        private String name;
+        private String value;
+
+        public CustomOption(String name) {
+            if (name.startsWith("--")) {
+                this.name = name.substring(2);
+            } else {
+                this.name = name;
+            }
+        }
+
+        public CustomOption(String name, String value) {
+            this(name);
+            this.value = value;
+        }
+
+        @Override
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+    }
+
     public static class Result {
         public String errors;
         public String output;
@@ -260,6 +288,14 @@ private List<String> prepareCommandOptions(boolean optimize, boolean combinedJso
             commandParts.add("--" + option.getName());
             commandParts.add(option.getValue());
         }
+
+        for (Option option : getElementsOf(CustomOption.class, options)) {
+            commandParts.add("--" + option.getName());
+            if (option.getValue() != null) {
+                commandParts.add(option.getValue());
+            }
+        }
+
         return commandParts;
     }