Commit eecdb2aa authored by Adams, Austin Joel's avatar Adams, Austin Joel
Browse files

Handle continue and {curly, braces} in xasm TokenCollector 



Include expressions wrapped in curly braces like {1,2,3} in the xasm
grammar, along with the continue keyword. Without these, programmers
aren't able to write things like X(q.extract_range({0,1});. This change
also fixes stray opening curly braces that were getting passed to antlr
after else statements, leading to unpredictable behavior.

Add a test which covers all of these changes, and character literals.

Signed-off-by: default avatarAustin Adams <aja@gatech.edu>
parent 0b3f5e7f

examples/bernstein_vazirani/bernstein_vazirani.cpp

+9 −6
Original line number Diff line number Diff line
@@ -8,18 +8,21 @@ __qpu__ void bernstein_vazirani(qreg q, std::string &secret_bits) { 
    }



    // oracle

    for (int i = 0; i < secret_bits.size(); i++) {

    for (int i = 0; i <= secret_bits.size(); i++) {

        if (i == secret_bits.size()) {

            // Silly condition just to test continue keyword

            continue;

        }



        if (secret_bits[i] == '1') {

            CX(q[i], q[secret_bits.size()]);

        }

    }



    for (int i = 0; i <= secret_bits.size(); i++) {

        H(q[i]);

    H(q);



        if (i < secret_bits.size())

            Measure(q[i]);

    }

    // Use this instead of head() to test that curly braces work

    Measure(q.extract_range({0, secret_bits.size()}));

}



int main() {

handlers/token_collector/xasm/generated/xasm_single.interp

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ null 
'?'

':'

'break'

'continue'

'return'

'auto'

'&'
@@ -99,6 +100,7 @@ null 
null

null

null

null

COMMENT

ID

REAL
@@ -125,4 +127,4 @@ string 




atn:

[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 54, 255, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 3, 2, 3, 2, 5, 2, 31, 10, 2, 3, 3, 3, 3, 5, 3, 35, 10, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 5, 6, 46, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 52, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 75, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 83, 10, 6, 3, 6, 3, 6, 5, 6, 87, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 93, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 103, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 110, 10, 6, 3, 6, 5, 6, 113, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 138, 10, 6, 3, 7, 3, 7, 5, 7, 142, 10, 7, 3, 7, 5, 7, 145, 10, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 7, 9, 152, 10, 9, 12, 9, 14, 9, 155, 11, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 177, 10, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 234, 10, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 242, 10, 10, 12, 10, 14, 10, 245, 11, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 2, 3, 18, 15, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 2, 6, 3, 2, 8, 9, 3, 2, 21, 22, 3, 2, 23, 26, 3, 2, 41, 46, 2, 292, 2, 30, 3, 2, 2, 2, 4, 34, 3, 2, 2, 2, 6, 36, 3, 2, 2, 2, 8, 38, 3, 2, 2, 2, 10, 137, 3, 2, 2, 2, 12, 144, 3, 2, 2, 2, 14, 146, 3, 2, 2, 2, 16, 148, 3, 2, 2, 2, 18, 176, 3, 2, 2, 2, 20, 246, 3, 2, 2, 2, 22, 248, 3, 2, 2, 2, 24, 250, 3, 2, 2, 2, 26, 252, 3, 2, 2, 2, 28, 31, 5, 4, 3, 2, 29, 31, 5, 6, 4, 2, 30, 28, 3, 2, 2, 2, 30, 29, 3, 2, 2, 2, 31, 3, 3, 2, 2, 2, 32, 35, 5, 8, 5, 2, 33, 35, 5, 10, 6, 2, 34, 32, 3, 2, 2, 2, 34, 33, 3, 2, 2, 2, 35, 5, 3, 2, 2, 2, 36, 37, 7, 47, 2, 2, 37, 7, 3, 2, 2, 2, 38, 39, 5, 22, 12, 2, 39, 40, 7, 3, 2, 2, 40, 41, 5, 16, 9, 2, 41, 42, 7, 4, 2, 2, 42, 43, 7, 5, 2, 2, 43, 9, 3, 2, 2, 2, 44, 46, 7, 6, 2, 2, 45, 44, 3, 2, 2, 2, 45, 46, 3, 2, 2, 2, 46, 47, 3, 2, 2, 2, 47, 48, 5, 12, 7, 2, 48, 51, 5, 18, 10, 2, 49, 50, 7, 7, 2, 2, 50, 52, 5, 18, 10, 2, 51, 49, 3, 2, 2, 2, 51, 52, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 54, 7, 5, 2, 2, 54, 138, 3, 2, 2, 2, 55, 56, 5, 18, 10, 2, 56, 57, 7, 8, 2, 2, 57, 58, 7, 5, 2, 2, 58, 138, 3, 2, 2, 2, 59, 60, 5, 18, 10, 2, 60, 61, 7, 9, 2, 2, 61, 62, 7, 5, 2, 2, 62, 138, 3, 2, 2, 2, 63, 64, 7, 10, 2, 2, 64, 65, 7, 3, 2, 2, 65, 66, 5, 12, 7, 2, 66, 67, 5, 18, 10, 2, 67, 68, 7, 7, 2, 2, 68, 69, 5, 18, 10, 2, 69, 74, 7, 5, 2, 2, 70, 71, 5, 18, 10, 2, 71, 72, 5, 14, 8, 2, 72, 73, 5, 18, 10, 2, 73, 75, 3, 2, 2, 2, 74, 70, 3, 2, 2, 2, 74, 75, 3, 2, 2, 2, 75, 76, 3, 2, 2, 2, 76, 82, 7, 5, 2, 2, 77, 78, 5, 18, 10, 2, 78, 79, 9, 2, 2, 2, 79, 83, 3, 2, 2, 2, 80, 81, 9, 2, 2, 2, 81, 83, 5, 18, 10, 2, 82, 77, 3, 2, 2, 2, 82, 80, 3, 2, 2, 2, 82, 83, 3, 2, 2, 2, 83, 84, 3, 2, 2, 2, 84, 86, 7, 4, 2, 2, 85, 87, 7, 11, 2, 2, 86, 85, 3, 2, 2, 2, 86, 87, 3, 2, 2, 2, 87, 138, 3, 2, 2, 2, 88, 138, 7, 12, 2, 2, 89, 90, 5, 18, 10, 2, 90, 92, 7, 3, 2, 2, 91, 93, 5, 16, 9, 2, 92, 91, 3, 2, 2, 2, 92, 93, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 95, 7, 4, 2, 2, 95, 96, 7, 5, 2, 2, 96, 138, 3, 2, 2, 2, 97, 98, 7, 13, 2, 2, 98, 99, 7, 3, 2, 2, 99, 100, 5, 16, 9, 2, 100, 102, 7, 4, 2, 2, 101, 103, 7, 11, 2, 2, 102, 101, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 138, 3, 2, 2, 2, 104, 105, 7, 14, 2, 2, 105, 106, 7, 3, 2, 2, 106, 107, 5, 16, 9, 2, 107, 109, 7, 4, 2, 2, 108, 110, 7, 11, 2, 2, 109, 108, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 138, 3, 2, 2, 2, 111, 113, 7, 6, 2, 2, 112, 111, 3, 2, 2, 2, 112, 113, 3, 2, 2, 2, 113, 114, 3, 2, 2, 2, 114, 115, 5, 12, 7, 2, 115, 116, 5, 18, 10, 2, 116, 117, 7, 7, 2, 2, 117, 118, 7, 3, 2, 2, 118, 119, 5, 18, 10, 2, 119, 120, 7, 15, 2, 2, 120, 121, 5, 18, 10, 2, 121, 122, 7, 4, 2, 2, 122, 123, 7, 16, 2, 2, 123, 124, 5, 18, 10, 2, 124, 125, 7, 17, 2, 2, 125, 126, 5, 18, 10, 2, 126, 127, 7, 5, 2, 2, 127, 138, 3, 2, 2, 2, 128, 129, 7, 18, 2, 2, 129, 138, 7, 5, 2, 2, 130, 131, 7, 19, 2, 2, 131, 138, 7, 5, 2, 2, 132, 133, 5, 18, 10, 2, 133, 134, 7, 7, 2, 2, 134, 135, 5, 18, 10, 2, 135, 136, 7, 5, 2, 2, 136, 138, 3, 2, 2, 2, 137, 45, 3, 2, 2, 2, 137, 55, 3, 2, 2, 2, 137, 59, 3, 2, 2, 2, 137, 63, 3, 2, 2, 2, 137, 88, 3, 2, 2, 2, 137, 89, 3, 2, 2, 2, 137, 97, 3, 2, 2, 2, 137, 104, 3, 2, 2, 2, 137, 112, 3, 2, 2, 2, 137, 128, 3, 2, 2, 2, 137, 130, 3, 2, 2, 2, 137, 132, 3, 2, 2, 2, 138, 11, 3, 2, 2, 2, 139, 141, 7, 20, 2, 2, 140, 142, 9, 3, 2, 2, 141, 140, 3, 2, 2, 2, 141, 142, 3, 2, 2, 2, 142, 145, 3, 2, 2, 2, 143, 145, 5, 18, 10, 2, 144, 139, 3, 2, 2, 2, 144, 143, 3, 2, 2, 2, 145, 13, 3, 2, 2, 2, 146, 147, 9, 4, 2, 2, 147, 15, 3, 2, 2, 2, 148, 153, 5, 18, 10, 2, 149, 150, 7, 27, 2, 2, 150, 152, 5, 18, 10, 2, 151, 149, 3, 2, 2, 2, 152, 155, 3, 2, 2, 2, 153, 151, 3, 2, 2, 2, 153, 154, 3, 2, 2, 2, 154, 17, 3, 2, 2, 2, 155, 153, 3, 2, 2, 2, 156, 157, 8, 10, 1, 2, 157, 177, 5, 22, 12, 2, 158, 159, 7, 29, 2, 2, 159, 177, 5, 18, 10, 16, 160, 161, 7, 3, 2, 2, 161, 162, 5, 18, 10, 2, 162, 163, 7, 4, 2, 2, 163, 177, 3, 2, 2, 2, 164, 165, 5, 20, 11, 2, 165, 166, 7, 3, 2, 2, 166, 167, 5, 18, 10, 2, 167, 168, 7, 4, 2, 2, 168, 177, 3, 2, 2, 2, 169, 177, 5, 26, 14, 2, 170, 177, 5, 24, 13, 2, 171, 177, 7, 50, 2, 2, 172, 177, 7, 51, 2, 2, 173, 177, 7, 37, 2, 2, 174, 175, 7, 40, 2, 2, 175, 177, 5, 18, 10, 3, 176, 156, 3, 2, 2, 2, 176, 158, 3, 2, 2, 2, 176, 160, 3, 2, 2, 2, 176, 164, 3, 2, 2, 2, 176, 169, 3, 2, 2, 2, 176, 170, 3, 2, 2, 2, 176, 171, 3, 2, 2, 2, 176, 172, 3, 2, 2, 2, 176, 173, 3, 2, 2, 2, 176, 174, 3, 2, 2, 2, 177, 243, 3, 2, 2, 2, 178, 179, 12, 26, 2, 2, 179, 180, 7, 28, 2, 2, 180, 242, 5, 18, 10, 27, 181, 182, 12, 25, 2, 2, 182, 183, 7, 29, 2, 2, 183, 242, 5, 18, 10, 26, 184, 185, 12, 24, 2, 2, 185, 186, 7, 22, 2, 2, 186, 242, 5, 18, 10, 25, 187, 188, 12, 23, 2, 2, 188, 189, 7, 30, 2, 2, 189, 242, 5, 18, 10, 24, 190, 191, 12, 22, 2, 2, 191, 192, 7, 31, 2, 2, 192, 242, 5, 18, 10, 23, 193, 194, 12, 21, 2, 2, 194, 195, 7, 32, 2, 2, 195, 242, 5, 18, 10, 22, 196, 197, 12, 15, 2, 2, 197, 198, 7, 34, 2, 2, 198, 242, 5, 18, 10, 16, 199, 200, 12, 5, 2, 2, 200, 201, 7, 38, 2, 2, 201, 242, 5, 18, 10, 6, 202, 203, 12, 4, 2, 2, 203, 204, 7, 39, 2, 2, 204, 242, 5, 18, 10, 5, 205, 206, 12, 20, 2, 2, 206, 207, 7, 24, 2, 2, 207, 208, 5, 18, 10, 2, 208, 209, 7, 23, 2, 2, 209, 242, 3, 2, 2, 2, 210, 211, 12, 19, 2, 2, 211, 212, 7, 31, 2, 2, 212, 213, 5, 18, 10, 2, 213, 214, 7, 3, 2, 2, 214, 215, 5, 16, 9, 2, 215, 216, 7, 4, 2, 2, 216, 242, 3, 2, 2, 2, 217, 218, 12, 18, 2, 2, 218, 219, 7, 33, 2, 2, 219, 220, 5, 18, 10, 2, 220, 221, 7, 3, 2, 2, 221, 222, 7, 4, 2, 2, 222, 242, 3, 2, 2, 2, 223, 224, 12, 17, 2, 2, 224, 225, 7, 33, 2, 2, 225, 226, 5, 18, 10, 2, 226, 227, 7, 3, 2, 2, 227, 228, 5, 16, 9, 2, 228, 229, 7, 4, 2, 2, 229, 242, 3, 2, 2, 2, 230, 231, 12, 12, 2, 2, 231, 233, 7, 3, 2, 2, 232, 234, 5, 16, 9, 2, 233, 232, 3, 2, 2, 2, 233, 234, 3, 2, 2, 2, 234, 235, 3, 2, 2, 2, 235, 242, 7, 4, 2, 2, 236, 237, 12, 11, 2, 2, 237, 238, 7, 35, 2, 2, 238, 239, 5, 18, 10, 2, 239, 240, 7, 36, 2, 2, 240, 242, 3, 2, 2, 2, 241, 178, 3, 2, 2, 2, 241, 181, 3, 2, 2, 2, 241, 184, 3, 2, 2, 2, 241, 187, 3, 2, 2, 2, 241, 190, 3, 2, 2, 2, 241, 193, 3, 2, 2, 2, 241, 196, 3, 2, 2, 2, 241, 199, 3, 2, 2, 2, 241, 202, 3, 2, 2, 2, 241, 205, 3, 2, 2, 2, 241, 210, 3, 2, 2, 2, 241, 217, 3, 2, 2, 2, 241, 223, 3, 2, 2, 2, 241, 230, 3, 2, 2, 2, 241, 236, 3, 2, 2, 2, 242, 245, 3, 2, 2, 2, 243, 241, 3, 2, 2, 2, 243, 244, 3, 2, 2, 2, 244, 19, 3, 2, 2, 2, 245, 243, 3, 2, 2, 2, 246, 247, 9, 5, 2, 2, 247, 21, 3, 2, 2, 2, 248, 249, 7, 48, 2, 2, 249, 23, 3, 2, 2, 2, 250, 251, 7, 49, 2, 2, 251, 25, 3, 2, 2, 2, 252, 253, 7, 52, 2, 2, 253, 27, 3, 2, 2, 2, 21, 30, 34, 45, 51, 74, 82, 86, 92, 102, 109, 112, 137, 141, 144, 153, 176, 233, 241, 243]
 
 No newline at end of file
 
[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 55, 258, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 3, 2, 3, 2, 5, 2, 31, 10, 2, 3, 3, 3, 3, 5, 3, 35, 10, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 5, 6, 46, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 52, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 75, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 83, 10, 6, 3, 6, 3, 6, 5, 6, 87, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 93, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 103, 10, 6, 3, 6, 3, 6, 5, 6, 107, 10, 6, 3, 6, 5, 6, 110, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 137, 10, 6, 3, 7, 3, 7, 5, 7, 141, 10, 7, 3, 7, 5, 7, 144, 10, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 7, 9, 151, 10, 9, 12, 9, 14, 9, 154, 11, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 180, 10, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 237, 10, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 245, 10, 10, 12, 10, 14, 10, 248, 11, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 2, 3, 18, 15, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 2, 6, 3, 2, 8, 9, 3, 2, 22, 23, 3, 2, 24, 27, 3, 2, 42, 47, 2, 297, 2, 30, 3, 2, 2, 2, 4, 34, 3, 2, 2, 2, 6, 36, 3, 2, 2, 2, 8, 38, 3, 2, 2, 2, 10, 136, 3, 2, 2, 2, 12, 143, 3, 2, 2, 2, 14, 145, 3, 2, 2, 2, 16, 147, 3, 2, 2, 2, 18, 179, 3, 2, 2, 2, 20, 249, 3, 2, 2, 2, 22, 251, 3, 2, 2, 2, 24, 253, 3, 2, 2, 2, 26, 255, 3, 2, 2, 2, 28, 31, 5, 4, 3, 2, 29, 31, 5, 6, 4, 2, 30, 28, 3, 2, 2, 2, 30, 29, 3, 2, 2, 2, 31, 3, 3, 2, 2, 2, 32, 35, 5, 8, 5, 2, 33, 35, 5, 10, 6, 2, 34, 32, 3, 2, 2, 2, 34, 33, 3, 2, 2, 2, 35, 5, 3, 2, 2, 2, 36, 37, 7, 48, 2, 2, 37, 7, 3, 2, 2, 2, 38, 39, 5, 22, 12, 2, 39, 40, 7, 3, 2, 2, 40, 41, 5, 16, 9, 2, 41, 42, 7, 4, 2, 2, 42, 43, 7, 5, 2, 2, 43, 9, 3, 2, 2, 2, 44, 46, 7, 6, 2, 2, 45, 44, 3, 2, 2, 2, 45, 46, 3, 2, 2, 2, 46, 47, 3, 2, 2, 2, 47, 48, 5, 12, 7, 2, 48, 51, 5, 18, 10, 2, 49, 50, 7, 7, 2, 2, 50, 52, 5, 18, 10, 2, 51, 49, 3, 2, 2, 2, 51, 52, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 54, 7, 5, 2, 2, 54, 137, 3, 2, 2, 2, 55, 56, 5, 18, 10, 2, 56, 57, 7, 8, 2, 2, 57, 58, 7, 5, 2, 2, 58, 137, 3, 2, 2, 2, 59, 60, 5, 18, 10, 2, 60, 61, 7, 9, 2, 2, 61, 62, 7, 5, 2, 2, 62, 137, 3, 2, 2, 2, 63, 64, 7, 10, 2, 2, 64, 65, 7, 3, 2, 2, 65, 66, 5, 12, 7, 2, 66, 67, 5, 18, 10, 2, 67, 68, 7, 7, 2, 2, 68, 69, 5, 18, 10, 2, 69, 74, 7, 5, 2, 2, 70, 71, 5, 18, 10, 2, 71, 72, 5, 14, 8, 2, 72, 73, 5, 18, 10, 2, 73, 75, 3, 2, 2, 2, 74, 70, 3, 2, 2, 2, 74, 75, 3, 2, 2, 2, 75, 76, 3, 2, 2, 2, 76, 82, 7, 5, 2, 2, 77, 78, 5, 18, 10, 2, 78, 79, 9, 2, 2, 2, 79, 83, 3, 2, 2, 2, 80, 81, 9, 2, 2, 2, 81, 83, 5, 18, 10, 2, 82, 77, 3, 2, 2, 2, 82, 80, 3, 2, 2, 2, 82, 83, 3, 2, 2, 2, 83, 84, 3, 2, 2, 2, 84, 86, 7, 4, 2, 2, 85, 87, 7, 11, 2, 2, 86, 85, 3, 2, 2, 2, 86, 87, 3, 2, 2, 2, 87, 137, 3, 2, 2, 2, 88, 137, 7, 12, 2, 2, 89, 90, 5, 18, 10, 2, 90, 92, 7, 3, 2, 2, 91, 93, 5, 16, 9, 2, 92, 91, 3, 2, 2, 2, 92, 93, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 95, 7, 4, 2, 2, 95, 96, 7, 5, 2, 2, 96, 137, 3, 2, 2, 2, 97, 98, 7, 13, 2, 2, 98, 99, 7, 3, 2, 2, 99, 100, 5, 16, 9, 2, 100, 102, 7, 4, 2, 2, 101, 103, 7, 11, 2, 2, 102, 101, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 137, 3, 2, 2, 2, 104, 106, 7, 14, 2, 2, 105, 107, 7, 11, 2, 2, 106, 105, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 137, 3, 2, 2, 2, 108, 110, 7, 6, 2, 2, 109, 108, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 111, 3, 2, 2, 2, 111, 112, 5, 12, 7, 2, 112, 113, 5, 18, 10, 2, 113, 114, 7, 7, 2, 2, 114, 115, 7, 3, 2, 2, 115, 116, 5, 18, 10, 2, 116, 117, 7, 15, 2, 2, 117, 118, 5, 18, 10, 2, 118, 119, 7, 4, 2, 2, 119, 120, 7, 16, 2, 2, 120, 121, 5, 18, 10, 2, 121, 122, 7, 17, 2, 2, 122, 123, 5, 18, 10, 2, 123, 124, 7, 5, 2, 2, 124, 137, 3, 2, 2, 2, 125, 126, 7, 18, 2, 2, 126, 137, 7, 5, 2, 2, 127, 128, 7, 19, 2, 2, 128, 137, 7, 5, 2, 2, 129, 130, 7, 20, 2, 2, 130, 137, 7, 5, 2, 2, 131, 132, 5, 18, 10, 2, 132, 133, 7, 7, 2, 2, 133, 134, 5, 18, 10, 2, 134, 135, 7, 5, 2, 2, 135, 137, 3, 2, 2, 2, 136, 45, 3, 2, 2, 2, 136, 55, 3, 2, 2, 2, 136, 59, 3, 2, 2, 2, 136, 63, 3, 2, 2, 2, 136, 88, 3, 2, 2, 2, 136, 89, 3, 2, 2, 2, 136, 97, 3, 2, 2, 2, 136, 104, 3, 2, 2, 2, 136, 109, 3, 2, 2, 2, 136, 125, 3, 2, 2, 2, 136, 127, 3, 2, 2, 2, 136, 129, 3, 2, 2, 2, 136, 131, 3, 2, 2, 2, 137, 11, 3, 2, 2, 2, 138, 140, 7, 21, 2, 2, 139, 141, 9, 3, 2, 2, 140, 139, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 144, 3, 2, 2, 2, 142, 144, 5, 18, 10, 2, 143, 138, 3, 2, 2, 2, 143, 142, 3, 2, 2, 2, 144, 13, 3, 2, 2, 2, 145, 146, 9, 4, 2, 2, 146, 15, 3, 2, 2, 2, 147, 152, 5, 18, 10, 2, 148, 149, 7, 28, 2, 2, 149, 151, 5, 18, 10, 2, 150, 148, 3, 2, 2, 2, 151, 154, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 17, 3, 2, 2, 2, 154, 152, 3, 2, 2, 2, 155, 156, 8, 10, 1, 2, 156, 180, 5, 22, 12, 2, 157, 158, 7, 30, 2, 2, 158, 180, 5, 18, 10, 17, 159, 160, 7, 3, 2, 2, 160, 161, 5, 18, 10, 2, 161, 162, 7, 4, 2, 2, 162, 180, 3, 2, 2, 2, 163, 164, 7, 11, 2, 2, 164, 165, 5, 16, 9, 2, 165, 166, 7, 12, 2, 2, 166, 180, 3, 2, 2, 2, 167, 168, 5, 20, 11, 2, 168, 169, 7, 3, 2, 2, 169, 170, 5, 18, 10, 2, 170, 171, 7, 4, 2, 2, 171, 180, 3, 2, 2, 2, 172, 180, 5, 26, 14, 2, 173, 180, 5, 24, 13, 2, 174, 180, 7, 51, 2, 2, 175, 180, 7, 52, 2, 2, 176, 180, 7, 38, 2, 2, 177, 178, 7, 41, 2, 2, 178, 180, 5, 18, 10, 3, 179, 155, 3, 2, 2, 2, 179, 157, 3, 2, 2, 2, 179, 159, 3, 2, 2, 2, 179, 163, 3, 2, 2, 2, 179, 167, 3, 2, 2, 2, 179, 172, 3, 2, 2, 2, 179, 173, 3, 2, 2, 2, 179, 174, 3, 2, 2, 2, 179, 175, 3, 2, 2, 2, 179, 176, 3, 2, 2, 2, 179, 177, 3, 2, 2, 2, 180, 246, 3, 2, 2, 2, 181, 182, 12, 27, 2, 2, 182, 183, 7, 29, 2, 2, 183, 245, 5, 18, 10, 28, 184, 185, 12, 26, 2, 2, 185, 186, 7, 30, 2, 2, 186, 245, 5, 18, 10, 27, 187, 188, 12, 25, 2, 2, 188, 189, 7, 23, 2, 2, 189, 245, 5, 18, 10, 26, 190, 191, 12, 24, 2, 2, 191, 192, 7, 31, 2, 2, 192, 245, 5, 18, 10, 25, 193, 194, 12, 23, 2, 2, 194, 195, 7, 32, 2, 2, 195, 245, 5, 18, 10, 24, 196, 197, 12, 22, 2, 2, 197, 198, 7, 33, 2, 2, 198, 245, 5, 18, 10, 23, 199, 200, 12, 16, 2, 2, 200, 201, 7, 35, 2, 2, 201, 245, 5, 18, 10, 17, 202, 203, 12, 5, 2, 2, 203, 204, 7, 39, 2, 2, 204, 245, 5, 18, 10, 6, 205, 206, 12, 4, 2, 2, 206, 207, 7, 40, 2, 2, 207, 245, 5, 18, 10, 5, 208, 209, 12, 21, 2, 2, 209, 210, 7, 25, 2, 2, 210, 211, 5, 18, 10, 2, 211, 212, 7, 24, 2, 2, 212, 245, 3, 2, 2, 2, 213, 214, 12, 20, 2, 2, 214, 215, 7, 32, 2, 2, 215, 216, 5, 18, 10, 2, 216, 217, 7, 3, 2, 2, 217, 218, 5, 16, 9, 2, 218, 219, 7, 4, 2, 2, 219, 245, 3, 2, 2, 2, 220, 221, 12, 19, 2, 2, 221, 222, 7, 34, 2, 2, 222, 223, 5, 18, 10, 2, 223, 224, 7, 3, 2, 2, 224, 225, 7, 4, 2, 2, 225, 245, 3, 2, 2, 2, 226, 227, 12, 18, 2, 2, 227, 228, 7, 34, 2, 2, 228, 229, 5, 18, 10, 2, 229, 230, 7, 3, 2, 2, 230, 231, 5, 16, 9, 2, 231, 232, 7, 4, 2, 2, 232, 245, 3, 2, 2, 2, 233, 234, 12, 12, 2, 2, 234, 236, 7, 3, 2, 2, 235, 237, 5, 16, 9, 2, 236, 235, 3, 2, 2, 2, 236, 237, 3, 2, 2, 2, 237, 238, 3, 2, 2, 2, 238, 245, 7, 4, 2, 2, 239, 240, 12, 11, 2, 2, 240, 241, 7, 36, 2, 2, 241, 242, 5, 18, 10, 2, 242, 243, 7, 37, 2, 2, 243, 245, 3, 2, 2, 2, 244, 181, 3, 2, 2, 2, 244, 184, 3, 2, 2, 2, 244, 187, 3, 2, 2, 2, 244, 190, 3, 2, 2, 2, 244, 193, 3, 2, 2, 2, 244, 196, 3, 2, 2, 2, 244, 199, 3, 2, 2, 2, 244, 202, 3, 2, 2, 2, 244, 205, 3, 2, 2, 2, 244, 208, 3, 2, 2, 2, 244, 213, 3, 2, 2, 2, 244, 220, 3, 2, 2, 2, 244, 226, 3, 2, 2, 2, 244, 233, 3, 2, 2, 2, 244, 239, 3, 2, 2, 2, 245, 248, 3, 2, 2, 2, 246, 244, 3, 2, 2, 2, 246, 247, 3, 2, 2, 2, 247, 19, 3, 2, 2, 2, 248, 246, 3, 2, 2, 2, 249, 250, 9, 5, 2, 2, 250, 21, 3, 2, 2, 2, 251, 252, 7, 49, 2, 2, 252, 23, 3, 2, 2, 2, 253, 254, 7, 50, 2, 2, 254, 25, 3, 2, 2, 2, 255, 256, 7, 53, 2, 2, 256, 27, 3, 2, 2, 2, 21, 30, 34, 45, 51, 74, 82, 86, 92, 102, 106, 109, 136, 140, 143, 152, 179, 236, 244, 246]
 
 No newline at end of file

handlers/token_collector/xasm/generated/xasm_single.tokens

+38 −36
Original line number Diff line number Diff line
@@ -42,14 +42,15 @@ T__40=41 
T__41=42

T__42=43

T__43=44

COMMENT=45

ID=46

REAL=47

INT=48

CHAR=49

STRING=50

WS=51

EOL=52

T__44=45

COMMENT=46

ID=47

REAL=48

INT=49

CHAR=50

STRING=51

WS=52

EOL=53

'('=1

')'=2

';'=3
@@ -66,31 +67,32 @@ EOL=52 
'?'=14

':'=15

'break'=16

'return'=17

'auto'=18

'&'=19

'*'=20

'>'=21

'<'=22

'>='=23

'<='=24

','=25

'+'=26

'-'=27

'/'=28

'::'=29

'<<'=30

'.'=31

'^'=32

'['=33

']'=34

'pi'=35

'&&'=36

'||'=37

'!'=38

'sin'=39

'cos'=40

'tan'=41

'exp'=42

'ln'=43

'sqrt'=44
 
'continue'=17

'return'=18

'auto'=19

'&'=20

'*'=21

'>'=22

'<'=23

'>='=24

'<='=25

','=26

'+'=27

'-'=28

'/'=29

'::'=30

'<<'=31

'.'=32

'^'=33

'['=34

']'=35

'pi'=36

'&&'=37

'||'=38

'!'=39

'sin'=40

'cos'=41

'tan'=42

'exp'=43

'ln'=44

'sqrt'=45

handlers/token_collector/xasm/generated/xasm_singleLexer.cpp

+222 −214

File changed.

Preview size limit exceeded, changes collapsed.

handlers/token_collector/xasm/generated/xasm_singleLexer.h

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ public: 
    T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, 

    T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38, 

    T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, 

    COMMENT = 45, ID = 46, REAL = 47, INT = 48, CHAR = 49, STRING = 50, 

    WS = 51, EOL = 52

    T__44 = 45, COMMENT = 46, ID = 47, REAL = 48, INT = 49, CHAR = 50, STRING = 51, 

    WS = 52, EOL = 53

  };



  explicit xasm_singleLexer(antlr4::CharStream *input);