Add support for static varaibles

regression-tests/pure2-static-qualifier-error1.cpp2

@@ -0,0 +1,2 @@
+// Nonsense
+foo: (p : static int) -> void = {}

regression-tests/pure2-static-qualifier-error2.cpp2

@@ -0,0 +1,2 @@
+// Nonsense
+foo: () -> static int -> {};

regression-tests/pure2-static-qualifier-error3.cpp2

@@ -0,0 +1,11 @@
+main: () -> int = {
+    // Nonsense
+    x: std::variant<static int, bool> = 42;
+
+    std::cout <<
+        inspect i -> std::string {
+            is int = "int";
+            is bool = "bool";
+            is _ = "unknown";
+        } << std::endl;
+}

regression-tests/pure2-static-qualifier-error4.cpp2

@@ -0,0 +1,11 @@
+main: () -> int = {
+    // Nonsense
+    x: static static std::variant<int, bool> = 42;
+
+    std::cout <<
+        inspect i -> std::string {
+            is int = "int";
+            is static bool = "bool";
+            is _ = "unknown";
+        } << std::endl;
+}

regression-tests/pure2-static-qualifier-error5.cpp2

@@ -0,0 +1,11 @@
+main: () -> int = {
+    x: std::variant<int, bool> = 42;
+
+    std::cout <<
+        inspect i -> std::string {
+            is int = "int";
+            // Nonsense
+            is static bool = "bool";
+            is _ = "unknown";
+        } << std::endl;
+}

regression-tests/pure2-static-var.cpp2

@@ -0,0 +1,9 @@
+green_bottles: () -> int = {
+    n: static _ = 10;
+    std::cout << n << std::endl;
+    return n--;
+}
+
+main: () -> int = {
+    while green_bottles() >= 0 {}
+}

regression-tests/pure2-var-declaration.cpp2

@@ -0,0 +1,41 @@
+main: () -> int = {
+    i1: = 42;
+    i1c: const _ = 42;
+    i1s: static _ = 42;
+    i2: int = 42;
+    i2s: static int = 42;
+    i2c: const int = 42;
+    i2sc: static const int = 42;
+
+
+    p1: * _ = i1&;
+    p1c: const* _ = i1&;
+    p1s: static* _ = i1s&;
+    p2: * const _ = i1&;
+    p2c: const* const _ = i1&;
+    p2s: static* const _ = i1s&;
+    p2cs: static const* const _ = i1s&;
+    p3: * int = i1&;
+    p3c: const * int = i1&;
+    p3s: static * int = i1s&;
+    p3sc: static const * int = i1s&;
+    p4: * const int = i1&;
+    p4s: static * const int = i1s&;
+    p5: const * int = i1&;
+    p5s: static const * int = i1s&;
+    p6: const * const * const int = p4&;
+    p6s: static const * const * const int = p5s&;
+
+
+    s1: = "Fred";
+    s1c: const _ = "Fred";
+    s1s: static _ = "Fred";
+    s1sc: static const _ = "Fred";
+    s2: std::string = "Fred";
+    s2c: const std::string = "Fred";
+    s2s: static std::string = "Fred";
+    s2sc: static const std::string = "Fred";
+
+
+    std::cout << s2sc << " is " << p6s** << std::endl;
+}

regression-tests/test-results/apple-clang-14/pure2-static-var.cpp.execution

@@ -0,0 +1,11 @@
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
+0

regression-tests/test-results/apple-clang-14/pure2-var-declaration.cpp.execution

@@ -0,0 +1 @@
+Fred is 42

regression-tests/test-results/clang-12/pure2-static-var.cpp.execution

@@ -0,0 +1,11 @@
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
+0

regression-tests/test-results/clang-12/pure2-var-declaration.cpp.execution

@@ -0,0 +1 @@
+Fred is 42

regression-tests/test-results/gcc-10/pure2-static-var.cpp.execution

@@ -0,0 +1,11 @@
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
+0

regression-tests/test-results/gcc-10/pure2-var-declaration.cpp.execution

@@ -0,0 +1 @@
+Fred is 42

regression-tests/test-results/msvc-2022/pure2-static-var.cpp.execution

@@ -0,0 +1,11 @@
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
+0

regression-tests/test-results/msvc-2022/pure2-var-declaration.cpp.execution

@@ -0,0 +1 @@
+Fred is 42

regression-tests/test-results/pure2-static-qualifier-error1.cpp2.output

@@ -0,0 +1,8 @@
+pure2-static-qualifier-error1.cpp2...
+pure2-static-qualifier-error1.cpp2(2,11): error: 'static' qualifier not allowed in this context (at 'static')
+pure2-static-qualifier-error1.cpp2(2,11): error: a deduced type must have an = initializer (at 'static')
+pure2-static-qualifier-error1.cpp2(2,7): error: invalid parameter list (at 'p')
+pure2-static-qualifier-error1.cpp2(2,9): error: a deduced type must have an = initializer (at ':')
+pure2-static-qualifier-error1.cpp2(2,1): error: unexpected text at end of Cpp2 code section (at 'foo')
+pure2-static-qualifier-error1.cpp2(1,0): error: parse failed for section starting here
+

regression-tests/test-results/pure2-static-qualifier-error2.cpp2.output

@@ -0,0 +1,8 @@
+pure2-static-qualifier-error2.cpp2...
+pure2-static-qualifier-error2.cpp2(2,12): error: 'static' qualifier not allowed in this context (at 'static')
+pure2-static-qualifier-error2.cpp2(2,12): error: missing function return after -> (at 'static')
+pure2-static-qualifier-error2.cpp2(2,12): error: 'static' qualifier not allowed in this context (at 'static')
+pure2-static-qualifier-error2.cpp2(2,12): error: a deduced type must have an = initializer (at 'static')
+pure2-static-qualifier-error2.cpp2(2,1): error: unexpected text at end of Cpp2 code section (at 'foo')
+pure2-static-qualifier-error2.cpp2(1,0): error: parse failed for section starting here
+

regression-tests/test-results/pure2-static-qualifier-error3.cpp2.output

@@ -0,0 +1,6 @@
+pure2-static-qualifier-error3.cpp2...
+pure2-static-qualifier-error3.cpp2(3,20): error: missing semicolon at end of declaration (at '<')
+pure2-static-qualifier-error3.cpp2(1,19): error: ill-formed initializer (at '{')
+pure2-static-qualifier-error3.cpp2(1,1): error: unexpected text at end of Cpp2 code section (at 'main')
+pure2-static-qualifier-error3.cpp2(1,0): error: parse failed for section starting here
+

regression-tests/test-results/pure2-static-qualifier-error4.cpp2.output

@@ -0,0 +1,7 @@
+pure2-static-qualifier-error4.cpp2...
+pure2-static-qualifier-error4.cpp2(3,15): error: more than one 'static' not allowed (at 'static')
+pure2-static-qualifier-error4.cpp2(3,15): error: a deduced type must have an = initializer (at 'static')
+pure2-static-qualifier-error4.cpp2(1,19): error: ill-formed initializer (at '{')
+pure2-static-qualifier-error4.cpp2(1,1): error: unexpected text at end of Cpp2 code section (at 'main')
+pure2-static-qualifier-error4.cpp2(1,0): error: parse failed for section starting here
+

regression-tests/test-results/pure2-static-qualifier-error5.cpp2.output

@@ -0,0 +1,8 @@
+pure2-static-qualifier-error5.cpp2...
+pure2-static-qualifier-error5.cpp2(8,16): error: 'static' qualifier not allowed in this context (at 'static')
+pure2-static-qualifier-error5.cpp2(8,23): error: expected = at start of inspect alternative body (at 'bool')
+pure2-static-qualifier-error5.cpp2(8,23): error: invalid alternative in inspect (at 'bool')
+pure2-static-qualifier-error5.cpp2(1,19): error: ill-formed initializer (at '{')
+pure2-static-qualifier-error5.cpp2(1,1): error: unexpected text at end of Cpp2 code section (at 'main')
+pure2-static-qualifier-error5.cpp2(1,0): error: parse failed for section starting here
+

regression-tests/test-results/pure2-static-var.cpp

@@ -0,0 +1,23 @@
+// ----- Cpp2 support -----
+#define CPP2_USE_MODULES         Yes
+#include "cpp2util.h"
+
+
+#line 1 "pure2-static-var.cpp2"
+[[nodiscard]] auto green_bottles() -> int;
+#line 7 "pure2-static-var.cpp2"
+[[nodiscard]] auto main() -> int;
+
+//=== Cpp2 definitions ==========================================================
+
+#line 1 "pure2-static-var.cpp2"
+[[nodiscard]] auto green_bottles() -> int{
+    auto static n {10}; 
+    std::cout << n << std::endl;
+    return --n; 
+}
+
+[[nodiscard]] auto main() -> int{
+    while( green_bottles() >= 0 ) {}
+}
+

regression-tests/test-results/pure2-static-var.cpp2.output

@@ -0,0 +1,2 @@
+pure2-static-var.cpp2... ok (all Cpp2, passes safety checks)
+

regression-tests/test-results/pure2-var-declaration.cpp

@@ -0,0 +1,53 @@
+// ----- Cpp2 support -----
+#define CPP2_USE_MODULES         Yes
+#include "cpp2util.h"
+
+
+#line 1 "pure2-var-declaration.cpp2"
+[[nodiscard]] auto main() -> int;
+
+//=== Cpp2 definitions ==========================================================
+
+#line 1 "pure2-var-declaration.cpp2"
+[[nodiscard]] auto main() -> int{
+    auto i1 {42}; 
+    auto const i1c {42}; 
+    auto static i1s {42}; 
+    int i2 {42}; 
+    int         static i2s {42}; 
+    int         const i2c {42}; 
+    int                static const i2sc {42}; 
+
+
+    auto* p1 {&i1}; 
+    auto* const p1c {&i1}; 
+    auto static* p1s {&i1s}; 
+    auto const* p2 {&i1}; 
+    auto const* const p2c {&i1}; 
+    auto static const* p2s {&i1s}; 
+    auto static const* const p2cs {&i1s}; 
+    int   * p3 {&i1}; 
+    int          * const p3c {&i1}; 
+    int           static* p3s {&i1s}; 
+    int                  static* const p3sc {&i1s}; 
+    int          const* p4 {&i1}; 
+    int                 static const* p4s {&i1s}; 
+    int         * const p5 {&i1}; 
+    int                 static* const p5s {&i1s}; 
+    int                        const* const* const p6 {&p4}; 
+    int                               static const* const* const p6s {&p5s}; 
+
+
+    auto s1 {"Fred"}; 
+    auto const s1c {"Fred"}; 
+    auto static s1s {"Fred"}; 
+    auto static const s1sc {"Fred"}; 
+    std::string s2 {"Fred"}; 
+    std::string const s2c {"Fred"}; 
+    std::string static s2s {"Fred"}; 
+    std::string        static const s2sc {"Fred"}; 
+
+
+    std::cout << std::move(s2sc) << " is " << *cpp2::assert_not_null(*cpp2::assert_not_null(std::move(p6s))) << std::endl;
+}
+

regression-tests/test-results/pure2-var-declaration.cpp2.output

@@ -0,0 +1,2 @@
+pure2-var-declaration.cpp2... ok (all Cpp2, passes safety checks)
+

source/cppfront.cpp

@@ -1229,6 +1229,11 @@ class cppfront
             try_emit<type_id_node::keyword    >(n.id);
         }
 
+        if(n.is_static_qualified()) {
+            printer.print_extra(" "); 
+            emit(*n.static_qualifier, false, pos);
+        }
+
         for (auto i = n.pc_qualifiers.rbegin(); i != n.pc_qualifiers.rend(); ++i) {
             if ((**i) == "const") { printer.print_cpp2(" ", pos); }
             emit(**i, false, pos);