Advertisement
Guest User

Untitled

a guest
Jul 28th, 2015
154
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.34 KB | None | 0 0
  1. commit 9ea53f84bec8109f5fab2482cea6180ea50968ed
  2. Author: Jakob Bornecrantz <wallbraker@gmail.com>
  3. Date: Wed Jul 8 17:35:24 2015 +0200
  4.  
  5. FIXES
  6.  
  7. diff --git a/src/volt/controller.volt b/src/volt/controller.volt
  8. index 0da4b1b..b4bd0d7 100644
  9. --- a/src/volt/controller.volt
  10. +++ b/src/volt/controller.volt
  11. @@ -1,7 +1,7 @@
  12. // Copyright © 2012-2014, Jakob Bornecrantz. All rights reserved.
  13. // See copyright notice in src/volt/license.d (BOOST ver. 1.0).
  14. module volt.controller;
  15. -
  16. +/+
  17. import watt.conv : toLower;
  18. import watt.io : error;
  19. import watt.process : system;
  20. @@ -442,3 +442,4 @@ version (Windows) {
  21. enum DEFAULT_OBJ = "a.obj";
  22. enum DEFAULT_EXE = "a.out";
  23. }
  24. ++/
  25. diff --git a/src/volt/ir/copy.volt b/src/volt/ir/copy.volt
  26. index 2e1855a..ed0b1f9 100644
  27. --- a/src/volt/ir/copy.volt
  28. +++ b/src/volt/ir/copy.volt
  29. @@ -307,7 +307,7 @@ Exp copyExp(Location location, Exp exp)
  30. */
  31. Node copyNode(Node n)
  32. {
  33. - final switch (n.nodeType) with (NodeType) {
  34. + /*final*/ switch (n.nodeType) with (NodeType) {
  35. case NonVisiting:
  36. assert(false, "non-visiting node");
  37. case Constant:
  38. @@ -421,6 +421,7 @@ Node copyNode(Node n)
  39. case FunctionSetType:
  40. case VaArgExp:
  41. case Invalid:
  42. + default:
  43. auto msg = format("invalid node '%s'", toString(n.nodeType));
  44. throw panic(n.location, msg);
  45. }
  46. diff --git a/src/volt/ir/util.volt b/src/volt/ir/util.volt
  47. index d44d360..11408b5 100644
  48. --- a/src/volt/ir/util.volt
  49. +++ b/src/volt/ir/util.volt
  50. @@ -7,7 +7,6 @@ import watt.conv;
  51. import volt.errors;
  52. import volt.interfaces;
  53. import volt.token.location;
  54. -import volt.semantic.util : canonicaliseStorageType;
  55. import volt.util.string : unescapeString;
  56. import ir = volt.ir.ir;
  57. import volt.ir.copy;
  58. @@ -582,7 +581,7 @@ ir.Constant buildConstantString(Location loc, string val, bool escape = true)
  59. c.location = loc;
  60. c._string = val;
  61. auto stor = buildStorageType(loc, ir.StorageType.Kind.Immutable, buildChar(loc));
  62. - canonicaliseStorageType(stor);
  63. + //canonicaliseStorageType(stor);
  64. c.type = buildArrayType(loc, stor);
  65. if (escape) {
  66. c.arrayData = cast(immutable(void)[]) unescapeString(loc, c._string);
  67. diff --git a/src/volt/license.volt b/src/volt/license.volt
  68. index 6abbd6c..70af603 100644
  69. --- a/src/volt/license.volt
  70. +++ b/src/volt/license.volt
  71. @@ -37,7 +37,7 @@ DEALINGS IN THE SOFTWARE.
  72.  
  73. global string[] licenseArray;
  74.  
  75. -static this()
  76. +global this()
  77. {
  78. licenseArray ~= license;
  79. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement