Goose  Diff

Differences From Artifact [b75dd09c70]:

  • File bs/lex/lexer.cpp — part of check-in [73972ef6be] at 2019-01-18 16:19:38 on branch trunk — Parser: implemented the Pratt parser skeleton. (user: achavasse size: 5340)
  • File bs/lexer/lexer.cpp — part of check-in [0ecc93dff5] at 2019-01-13 16:24:54 on branch trunk — Lexer: fix token locations. (user: achavasse size: 5340)

To Artifact [86c5331839]:

  • File bs/lex/lexer.cpp — part of check-in [3acca150d3] at 2019-01-23 13:48:31 on branch trunk — ir, lexer: defined a new term type for block delimiters. (user: achavasse size: 5425)

205
206
207
208
209
210
211








212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
        return readIntegerLiteral( move( loc ) );

    if( isalpha( c ) || c == '_' )
        return readAlphanumericIdentifier( move( loc ) );

    switch( c )
    {








        case '{':
            m_input.get();
            return Term( move( loc ), "{"_sid );

        case '}':
            m_input.get();
            return Term( move( loc ), "}"_sid );

        case '(':
            m_input.get();
            return Term( move( loc ), "("_sid );

        case ')':
            m_input.get();
            return Term( move( loc ), ")"_sid );

        case '[':
            m_input.get();
            return Term( move( loc ), "["_sid );

        case ']':
            m_input.get();
            return Term( move( loc ), "]"_sid );

        case '"':
            m_input.get();
            return readStringLiteral( move( loc ) );

        case ';':
            return readSemicolon( move( loc ) );







>
>
>
>
>
>
>
>


|



|
<
<
<
<
<
<
<
<



|



|







205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226








227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
        return readIntegerLiteral( move( loc ) );

    if( isalpha( c ) || c == '_' )
        return readAlphanumericIdentifier( move( loc ) );

    switch( c )
    {
        case '(':
            m_input.get();
            return Term( move( loc ), Delimiter::OpenParen );

        case ')':
            m_input.get();
            return Term( move( loc ), Delimiter::CloseParen );

        case '{':
            m_input.get();
            return Term( move( loc ), Delimiter::OpenBrace );

        case '}':
            m_input.get();
            return Term( move( loc ), Delimiter::CloseBrace );









        case '[':
            m_input.get();
            return Term( move( loc ), Delimiter::OpenBracket );

        case ']':
            m_input.get();
            return Term( move( loc ), Delimiter::CloseBracket );

        case '"':
            m_input.get();
            return readStringLiteral( move( loc ) );

        case ';':
            return readSemicolon( move( loc ) );