Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial implementation of raw string literals #1304

Merged
merged 50 commits into from
Jun 22, 2022
Merged

Initial implementation of raw string literals #1304

merged 50 commits into from
Jun 22, 2022

Commits on May 31, 2022

  1. test cases for raw string literals

    @SlaterLatiao
    SlaterLatiao committed May 31, 2022
    Configuration menu
    Copy the full SHA
    a4ff50d View commit details
    Browse the repository at this point in the history

  2. raw string literal implementation

    @SlaterLatiao
    SlaterLatiao committed May 31, 2022
    Configuration menu
    Copy the full SHA
    a31dda2 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. match as block string if starting with triple ", and better error mes… 

    …sage for simple string

except for *#"""#*
    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    d3be382 View commit details
    Browse the repository at this point in the history

  2. fix broken test case 

    block string  literal cannot be one line
    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    ece0b7f View commit details
    Browse the repository at this point in the history

  3. test cases for raw string literals

    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    4d56ea6 View commit details
    Browse the repository at this point in the history

  4. raw string literal implementation

    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    7a32eec View commit details
    Browse the repository at this point in the history

  5. match as block string if starting with triple ", and better error mes… 

    …sage for simple string

except for *#"""#*
    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    5745c55 View commit details
    Browse the repository at this point in the history

  6. fix broken test case 

    block string  literal cannot be one line
    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    d5f69af View commit details
    Browse the repository at this point in the history

  7. Merge branch 'raw_string' of github.com:SlaterLatiao/carbon-lang into… 

    … raw_string
    @SlaterLatiao
    SlaterLatiao committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    75bcbcf View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. removed unused initial value

    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    ac735be View commit details
    Browse the repository at this point in the history

  2. rename flag to indicate multi-line string and remove comment

    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    ebdf8f7 View commit details
    Browse the repository at this point in the history

  3. use * to get value from std::optional

    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    743aed6 View commit details
    Browse the repository at this point in the history

  4. clean-ups

    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    d509aa5 View commit details
    Browse the repository at this point in the history

  5. removed skip_scan flag and directly return in case of a single line s… 

    …tring starting with #+\'\'\'
    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    d51377d View commit details
    Browse the repository at this point in the history

  6. Updated error message: simple string -> single-line string. 

    Co-authored-by: josh11b <josh11b@users.noreply.github.com>
    @SlaterLatiao @josh11b
    SlaterLatiao and josh11b committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    855fe32 View commit details
    Browse the repository at this point in the history

  7. Updated test cases according to changes in error message

    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    17bc3cf View commit details
    Browse the repository at this point in the history

  8. Removed counting_hashtag flag.

    @SlaterLatiao
    SlaterLatiao committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    9ac7418 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2022

  1. Implemented ScanHelper class to handle scanning

    @SlaterLatiao
    SlaterLatiao committed Jun 4, 2022
    Configuration menu
    Copy the full SHA
    43ab9a6 View commit details
    Browse the repository at this point in the history

  2. Fixed explanation of ReadHashTags.

    @SlaterLatiao
    SlaterLatiao committed Jun 4, 2022
    Configuration menu
    Copy the full SHA
    750b034 View commit details
    Browse the repository at this point in the history

  3. Addressed PR comment.

    @SlaterLatiao
    SlaterLatiao committed Jun 4, 2022
    Configuration menu
    Copy the full SHA
    266359a View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. Clarify that scan_helper holds the source text.

    @SlaterLatiao
    SlaterLatiao committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    8437c5c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Addressed PR comments.

    @SlaterLatiao
    SlaterLatiao committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    51b2af9 View commit details
    Browse the repository at this point in the history

  2. Updated error messages in test cases.

    @SlaterLatiao
    SlaterLatiao committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    b5791ad View commit details
    Browse the repository at this point in the history

  3. Added const keyword to return type of GetCurrentStr().

    @SlaterLatiao
    SlaterLatiao committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    1914495 View commit details
    Browse the repository at this point in the history

  4. addressed PR comments. 

    1. Moved ScanHelper class to lex_scan_helper.h and lex_scan_helper.cpp.
2. Moved ReadHashTags and Process* functions to lex_scan_helper.cpp. Moved YY_USER_ACTION, SIMPLE_TOKEN and ARG_TOKEN to lex_helper.h. Added a wrapper function YyinputWrapper to call static function yyinput in lexer.lpp.
3. Renamed ScanHelper with StringLexHelper.
4. Modified BUILD accordingly.
5. Renamed data members and functions.
    @SlaterLatiao
    SlaterLatiao committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    4acf2ae View commit details
    Browse the repository at this point in the history

  5. Addressed PR comments. 

    1. Adjusted order to keep ret usage close.
2. Used resize to construct the string to avoid creation of temp string.

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    c8dcc8b View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Removed the multi_line flag and skip_read field to improve readability.

    @SlaterLatiao
    SlaterLatiao committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    46ed305 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'raw_string' of github.com:SlaterLatiao/carbon-lang into… 

    … raw_string
    @SlaterLatiao
    SlaterLatiao committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    cb0039b View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2022

  1. Copied default parameter value to definition of UnescapeStringLiteral. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    9cf8448 View commit details
    Browse the repository at this point in the history

  2. Copied default parameter value to definition of ParseBlockStringLiteral. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    54c46c1 View commit details
    Browse the repository at this point in the history

  3. Prefix CARBON_ to SIMPLE_TOKEN and ARG_TOKEN macros.

    @SlaterLatiao
    SlaterLatiao committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    78da5b9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'raw_string' of github.com:SlaterLatiao/carbon-lang into… 

    … raw_string
    @SlaterLatiao
    SlaterLatiao committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    3c2e90d View commit details
    Browse the repository at this point in the history

  5. Rollback redefinition of arguments.

    @SlaterLatiao
    SlaterLatiao committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    70709cd View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

  1. Updated comment on the flex macro. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    6f45efc View commit details
    Browse the repository at this point in the history

  2. Updated wording. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    00401d8 View commit details
    Browse the repository at this point in the history

  3. Moved the EOF error out of the loop.

    @SlaterLatiao
    SlaterLatiao committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    65facf5 View commit details
    Browse the repository at this point in the history

  4. Removed duplicated declaration.

    @SlaterLatiao
    SlaterLatiao committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    0c91724 View commit details
    Browse the repository at this point in the history

  5. Changed type of hashtag_num and leading_quotes to int.

    @SlaterLatiao
    SlaterLatiao committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    f8e8054 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. Minor fix: string copy. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    7cc8cbb View commit details
    Browse the repository at this point in the history

  2. Added comment on YyinputWrapper. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    a45fd15 View commit details
    Browse the repository at this point in the history

  3. Garmmar in comment. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    24d3149 View commit details
    Browse the repository at this point in the history

  4. Added check of eof before readling next char.

    @SlaterLatiao
    SlaterLatiao committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    ec4477b View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. Minor updates based on PR comments.

    @SlaterLatiao
    SlaterLatiao committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    1346f92 View commit details
    Browse the repository at this point in the history

  2. Minor changes to address PR comments.

    @SlaterLatiao
    SlaterLatiao committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    bb63820 View commit details
    Browse the repository at this point in the history

  3. Used a clearer way to calculate hashtag_num and leading_quotes. S… 

    …witched back to indicate muti-line string with a flag.
    @SlaterLatiao
    SlaterLatiao committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    3a8d488 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. Directly copy StringRef for compilation error message.

    @SlaterLatiao
    SlaterLatiao committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    aa6e246 View commit details
    Browse the repository at this point in the history

  2. Make str_with_quote const as we don't change it. 

    Co-authored-by: josh11b <josh11b@users.noreply.github.com>
    @SlaterLatiao @josh11b
    SlaterLatiao and josh11b committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    6a77fea View commit details
    Browse the repository at this point in the history

  3. Added TODO for unsupported cases.

    @SlaterLatiao
    SlaterLatiao committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    eae97d5 View commit details
    Browse the repository at this point in the history

  4. Merged upstream trunk into raw_string.

    @SlaterLatiao
    SlaterLatiao committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    2aba1f6 View commit details
    Browse the repository at this point in the history

  5. Fixed a typo. 

    Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
    @SlaterLatiao @jonmeow
    SlaterLatiao and jonmeow committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    4e238e8 View commit details
    Browse the repository at this point in the history