@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE(string_escapes_legal_before_080)
187187
188188BOOST_AUTO_TEST_CASE (string_escapes_with_zero)
189189{
190- TestScanner scanner (" { \" a\\ x61\\ x00abc\" " );
190+ TestScanner const scanner (" { \" a\\ x61\\ x00abc\" " );
191191 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
192192 BOOST_CHECK_EQUAL (scanner.next (), Token::StringLiteral);
193193 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" aa\0 abc" , 6 ));
@@ -404,7 +404,7 @@ BOOST_AUTO_TEST_CASE(number_literals_with_trailing_underscore_at_eos)
404404
405405BOOST_AUTO_TEST_CASE (negative_numbers)
406406{
407- TestScanner scanner (" var x = -.2 + -0x78 + -7.3 + 8.9 + 2e-2;" );
407+ TestScanner const scanner (" var x = -.2 + -0x78 + -7.3 + 8.9 + 2e-2;" );
408408 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Var);
409409 BOOST_CHECK_EQUAL (scanner.next (), Token::Identifier);
410410 BOOST_CHECK_EQUAL (scanner.next (), Token::Assign);
@@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE(negative_numbers)
431431
432432BOOST_AUTO_TEST_CASE (locations)
433433{
434- TestScanner scanner (" function_identifier has ; -0x743/*comment*/\n ident //comment" );
434+ TestScanner const scanner (" function_identifier has ; -0x743/*comment*/\n ident //comment" );
435435 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
436436 BOOST_CHECK_EQUAL (scanner.currentLocation ().start , 0 );
437437 BOOST_CHECK_EQUAL (scanner.currentLocation ().end , 19 );
@@ -454,7 +454,7 @@ BOOST_AUTO_TEST_CASE(locations)
454454BOOST_AUTO_TEST_CASE (ambiguities)
455455{
456456 // test scanning of some operators which need look-ahead
457- TestScanner scanner (" <=" " <" " + +=a++ =>" " <<" " >>" " >>=" " >>>" " >>>=" " >>>>>=><<=" );
457+ TestScanner const scanner (" <=" " <" " + +=a++ =>" " <<" " >>" " >>=" " >>>" " >>>=" " >>>>>=><<=" );
458458 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LessThanOrEqual);
459459 BOOST_CHECK_EQUAL (scanner.next (), Token::LessThan);
460460 BOOST_CHECK_EQUAL (scanner.next (), Token::Add);
@@ -476,21 +476,21 @@ BOOST_AUTO_TEST_CASE(ambiguities)
476476
477477BOOST_AUTO_TEST_CASE (documentation_comments_parsed_begin)
478478{
479- TestScanner scanner (" /// Send $(value / 1000) chocolates to the user" );
479+ TestScanner const scanner (" /// Send $(value / 1000) chocolates to the user" );
480480 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::EOS);
481481 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " Send $(value / 1000) chocolates to the user" );
482482}
483483
484484BOOST_AUTO_TEST_CASE (multiline_documentation_comments_parsed_begin)
485485{
486- TestScanner scanner (" /** Send $(value / 1000) chocolates to the user*/" );
486+ TestScanner const scanner (" /** Send $(value / 1000) chocolates to the user*/" );
487487 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::EOS);
488488 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " Send $(value / 1000) chocolates to the user" );
489489}
490490
491491BOOST_AUTO_TEST_CASE (documentation_comments_parsed)
492492{
493- TestScanner scanner (" some other tokens /// Send $(value / 1000) chocolates to the user" );
493+ TestScanner const scanner (" some other tokens /// Send $(value / 1000) chocolates to the user" );
494494 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
495495 BOOST_CHECK_EQUAL (scanner.next (), Token::Identifier);
496496 BOOST_CHECK_EQUAL (scanner.next (), Token::Identifier);
@@ -500,7 +500,7 @@ BOOST_AUTO_TEST_CASE(documentation_comments_parsed)
500500
501501BOOST_AUTO_TEST_CASE (multiline_documentation_comments_parsed)
502502{
503- TestScanner scanner (" some other tokens /**\n "
503+ TestScanner const scanner (" some other tokens /**\n "
504504 " * Send $(value / 1000) chocolates to the user\n "
505505 " */" );
506506 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
@@ -512,7 +512,7 @@ BOOST_AUTO_TEST_CASE(multiline_documentation_comments_parsed)
512512
513513BOOST_AUTO_TEST_CASE (multiline_documentation_no_stars)
514514{
515- TestScanner scanner (" some other tokens /**\n "
515+ TestScanner const scanner (" some other tokens /**\n "
516516 " Send $(value / 1000) chocolates to the user\n "
517517 " */" );
518518 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
@@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE(multiline_documentation_no_stars)
524524
525525BOOST_AUTO_TEST_CASE (multiline_documentation_whitespace_hell)
526526{
527- TestScanner scanner (" some other tokens /** \t \r \n "
527+ TestScanner const scanner (" some other tokens /** \t \r \n "
528528 " \t \r * Send $(value / 1000) chocolates to the user\n "
529529 " */" );
530530 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
@@ -536,35 +536,35 @@ BOOST_AUTO_TEST_CASE(multiline_documentation_whitespace_hell)
536536
537537BOOST_AUTO_TEST_CASE (comment_before_eos)
538538{
539- TestScanner scanner (" //" );
539+ TestScanner const scanner (" //" );
540540 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::EOS);
541541 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
542542}
543543
544544BOOST_AUTO_TEST_CASE (documentation_comment_before_eos)
545545{
546- TestScanner scanner (" ///" );
546+ TestScanner const scanner (" ///" );
547547 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::EOS);
548548 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
549549}
550550
551551BOOST_AUTO_TEST_CASE (empty_multiline_comment)
552552{
553- TestScanner scanner (" /**/" );
553+ TestScanner const scanner (" /**/" );
554554 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::EOS);
555555 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
556556}
557557
558558BOOST_AUTO_TEST_CASE (empty_multiline_documentation_comment_before_eos)
559559{
560- TestScanner scanner (" /***/" );
560+ TestScanner const scanner (" /***/" );
561561 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::EOS);
562562 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
563563}
564564
565565BOOST_AUTO_TEST_CASE (comments_mixed_in_sequence)
566566{
567- TestScanner scanner (" hello_world ///documentation comment \n "
567+ TestScanner const scanner (" hello_world ///documentation comment \n "
568568 " //simple comment \n "
569569 " <<" );
570570 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
@@ -574,15 +574,15 @@ BOOST_AUTO_TEST_CASE(comments_mixed_in_sequence)
574574
575575BOOST_AUTO_TEST_CASE (ether_subdenominations)
576576{
577- TestScanner scanner (" wei gwei ether" );
577+ TestScanner const scanner (" wei gwei ether" );
578578 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::SubWei);
579579 BOOST_CHECK_EQUAL (scanner.next (), Token::SubGwei);
580580 BOOST_CHECK_EQUAL (scanner.next (), Token::SubEther);
581581}
582582
583583BOOST_AUTO_TEST_CASE (time_subdenominations)
584584{
585- TestScanner scanner (" seconds minutes hours days weeks years" );
585+ TestScanner const scanner (" seconds minutes hours days weeks years" );
586586 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::SubSecond);
587587 BOOST_CHECK_EQUAL (scanner.next (), Token::SubMinute);
588588 BOOST_CHECK_EQUAL (scanner.next (), Token::SubHour);
@@ -593,7 +593,7 @@ BOOST_AUTO_TEST_CASE(time_subdenominations)
593593
594594BOOST_AUTO_TEST_CASE (empty_comment)
595595{
596- TestScanner scanner (" //\n contract{}" );
596+ TestScanner const scanner (" //\n contract{}" );
597597 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
598598 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Contract);
599599 BOOST_CHECK_EQUAL (scanner.next (), Token::LBrace);
@@ -605,39 +605,39 @@ BOOST_AUTO_TEST_CASE(empty_comment)
605605
606606BOOST_AUTO_TEST_CASE (valid_unicode_string_escape)
607607{
608- TestScanner scanner (" { \"\\ u00DAnicode\" " );
608+ TestScanner const scanner (" { \"\\ u00DAnicode\" " );
609609 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
610610 BOOST_CHECK_EQUAL (scanner.next (), Token::StringLiteral);
611611 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" \xC3\x9A nicode" , 8 ));
612612}
613613
614614BOOST_AUTO_TEST_CASE (valid_unicode_string_escape_7f)
615615{
616- TestScanner scanner (" { \"\\ u007Fnicode\" " );
616+ TestScanner const scanner (" { \"\\ u007Fnicode\" " );
617617 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
618618 BOOST_CHECK_EQUAL (scanner.next (), Token::StringLiteral);
619619 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" \x7F nicode" , 7 ));
620620}
621621
622622BOOST_AUTO_TEST_CASE (valid_unicode_string_escape_7ff)
623623{
624- TestScanner scanner (" { \"\\ u07FFnicode\" " );
624+ TestScanner const scanner (" { \"\\ u07FFnicode\" " );
625625 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
626626 BOOST_CHECK_EQUAL (scanner.next (), Token::StringLiteral);
627627 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" \xDF\xBF nicode" , 8 ));
628628}
629629
630630BOOST_AUTO_TEST_CASE (valid_unicode_string_escape_ffff)
631631{
632- TestScanner scanner (" { \"\\ uFFFFnicode\" " );
632+ TestScanner const scanner (" { \"\\ uFFFFnicode\" " );
633633 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
634634 BOOST_CHECK_EQUAL (scanner.next (), Token::StringLiteral);
635635 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" \xEF\xBF\xBF nicode" , 9 ));
636636}
637637
638638BOOST_AUTO_TEST_CASE (invalid_short_unicode_string_escape)
639639{
640- TestScanner scanner (" { \"\\ uFFnicode\" " );
640+ TestScanner const scanner (" { \"\\ uFFnicode\" " );
641641 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
642642 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
643643}
@@ -659,7 +659,7 @@ BOOST_AUTO_TEST_CASE(unicode_prefix_only)
659659
660660BOOST_AUTO_TEST_CASE (unicode_invalid_space)
661661{
662- TestScanner scanner (" { unicode " );
662+ TestScanner const scanner (" { unicode " );
663663 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
664664 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
665665 BOOST_CHECK_EQUAL (scanner.currentError (), ScannerError::IllegalToken);
@@ -682,7 +682,7 @@ BOOST_AUTO_TEST_CASE(unicode_invalid_token)
682682
683683BOOST_AUTO_TEST_CASE (valid_unicode_literal)
684684{
685- TestScanner scanner (" { unicode\" Hello 😃\" " );
685+ TestScanner const scanner (" { unicode\" Hello 😃\" " );
686686 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
687687 BOOST_CHECK_EQUAL (scanner.next (), Token::UnicodeStringLiteral);
688688 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" Hello \xf0\x9f\x98\x83 " , 10 ));
@@ -691,7 +691,7 @@ BOOST_AUTO_TEST_CASE(valid_unicode_literal)
691691BOOST_AUTO_TEST_CASE (valid_nonprintable_in_unicode_literal)
692692{
693693 // Non-printable characters are allowed in unicode strings...
694- TestScanner scanner (" { unicode\" Hello \007 😃\" " );
694+ TestScanner const scanner (" { unicode\" Hello \007 😃\" " );
695695 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
696696 BOOST_CHECK_EQUAL (scanner.next (), Token::UnicodeStringLiteral);
697697 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" Hello \x07\xf0\x9f\x98\x83 " , 11 ));
@@ -713,7 +713,7 @@ BOOST_AUTO_TEST_CASE(hex_prefix_only)
713713
714714BOOST_AUTO_TEST_CASE (hex_invalid_space)
715715{
716- TestScanner scanner (" { hex " );
716+ TestScanner const scanner (" { hex " );
717717 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
718718 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
719719 BOOST_CHECK_EQUAL (scanner.currentError (), ScannerError::IllegalToken);
@@ -734,39 +734,39 @@ BOOST_AUTO_TEST_CASE(hex_invalid_token)
734734
735735BOOST_AUTO_TEST_CASE (valid_hex_literal)
736736{
737- TestScanner scanner (" { hex\" 00112233FF\" " );
737+ TestScanner const scanner (" { hex\" 00112233FF\" " );
738738 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
739739 BOOST_CHECK_EQUAL (scanner.next (), Token::HexStringLiteral);
740740 BOOST_CHECK_EQUAL (scanner.currentLiteral (), std::string (" \x00\x11\x22\x33\xFF " , 5 ));
741741}
742742
743743BOOST_AUTO_TEST_CASE (invalid_short_hex_literal)
744744{
745- TestScanner scanner (" { hex\" 00112233F\" " );
745+ TestScanner const scanner (" { hex\" 00112233F\" " );
746746 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
747747 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
748748 BOOST_CHECK_EQUAL (scanner.currentError (), ScannerError::IllegalHexString);
749749}
750750
751751BOOST_AUTO_TEST_CASE (invalid_hex_literal_with_space)
752752{
753- TestScanner scanner (" { hex\" 00112233FF \" " );
753+ TestScanner const scanner (" { hex\" 00112233FF \" " );
754754 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
755755 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
756756 BOOST_CHECK_EQUAL (scanner.currentError (), ScannerError::IllegalHexString);
757757}
758758
759759BOOST_AUTO_TEST_CASE (invalid_hex_literal_with_wrong_quotes)
760760{
761- TestScanner scanner (" { hex\" 00112233FF'" );
761+ TestScanner const scanner (" { hex\" 00112233FF'" );
762762 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
763763 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
764764 BOOST_CHECK_EQUAL (scanner.currentError (), ScannerError::IllegalHexString);
765765}
766766
767767BOOST_AUTO_TEST_CASE (invalid_hex_literal_nonhex_string)
768768{
769- TestScanner scanner (" { hex\" hello\" " );
769+ TestScanner const scanner (" { hex\" hello\" " );
770770 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::LBrace);
771771 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
772772 BOOST_CHECK_EQUAL (scanner.currentError (), ScannerError::IllegalHexString);
@@ -777,22 +777,22 @@ BOOST_AUTO_TEST_CASE(invalid_hex_literal_nonhex_string)
777777BOOST_AUTO_TEST_CASE (invalid_multiline_comment_close)
778778{
779779 // This used to parse as "comment", "identifier"
780- TestScanner scanner (" /** / x" );
780+ TestScanner const scanner (" /** / x" );
781781 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
782782 BOOST_CHECK_EQUAL (scanner.next (), Token::EOS);
783783}
784784
785785BOOST_AUTO_TEST_CASE (multiline_doc_comment_at_eos)
786786{
787787 // This used to parse as "whitespace"
788- TestScanner scanner (" /**" );
788+ TestScanner const scanner (" /**" );
789789 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
790790 BOOST_CHECK_EQUAL (scanner.next (), Token::EOS);
791791}
792792
793793BOOST_AUTO_TEST_CASE (multiline_comment_at_eos)
794794{
795- TestScanner scanner (" /*" );
795+ TestScanner const scanner (" /*" );
796796 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
797797 BOOST_CHECK_EQUAL (scanner.next (), Token::EOS);
798798}
@@ -801,7 +801,7 @@ BOOST_AUTO_TEST_CASE(regular_line_break_in_single_line_comment)
801801{
802802 for (auto const & nl: {" \r " , " \n " , " \r\n " })
803803 {
804- TestScanner scanner (" // abc " + std::string (nl) + " def " );
804+ TestScanner const scanner (" // abc " + std::string (nl) + " def " );
805805 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
806806 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
807807 BOOST_CHECK_EQUAL (scanner.currentLiteral (), " def" );
@@ -813,7 +813,7 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_single_line_comment)
813813{
814814 for (auto const & nl: {" \v " , " \f " , " \xE2\x80\xA8 " , " \xE2\x80\xA9 " })
815815 {
816- TestScanner scanner (" // abc " + std::string (nl) + " def " );
816+ TestScanner const scanner (" // abc " + std::string (nl) + " def " );
817817 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " " );
818818 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
819819 for (size_t i = 0 ; i < std::string (nl).size () - 1 ; i++)
@@ -828,7 +828,7 @@ BOOST_AUTO_TEST_CASE(regular_line_breaks_in_single_line_doc_comment)
828828{
829829 for (auto const & nl: {" \r " , " \n " , " \r\n " })
830830 {
831- TestScanner scanner (" /// abc " + std::string (nl) + " def " );
831+ TestScanner const scanner (" /// abc " + std::string (nl) + " def " );
832832 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " abc " );
833833 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Identifier);
834834 BOOST_CHECK_EQUAL (scanner.currentLiteral (), " def" );
@@ -842,7 +842,7 @@ BOOST_AUTO_TEST_CASE(regular_line_breaks_in_multiline_doc_comment)
842842 // Any accepted non-LF is being canonicalized to LF.
843843 for (auto const & nl : {" \r " s, " \n " s, " \r\n " s})
844844 {
845- TestScanner scanner{" /// Hello" + nl + " /// World" + nl + " ident" };
845+ TestScanner const scanner{" /// Hello" + nl + " /// World" + nl + " ident" };
846846 auto const & lit = scanner.currentCommentLiteral ();
847847 BOOST_CHECK_EQUAL (lit, " Hello\n World" );
848848 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " Hello\n World" );
@@ -856,7 +856,7 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_single_line_doc_comment)
856856{
857857 for (auto const & nl: {" \v " , " \f " , " \xE2\x80\xA8 " , " \xE2\x80\xA9 " })
858858 {
859- TestScanner scanner (" /// abc " + std::string (nl) + " def " );
859+ TestScanner const scanner (" /// abc " + std::string (nl) + " def " );
860860 BOOST_CHECK_EQUAL (scanner.currentCommentLiteral (), " abc " );
861861 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
862862 for (size_t i = 0 ; i < std::string (nl).size () - 1 ; i++)
@@ -871,7 +871,7 @@ BOOST_AUTO_TEST_CASE(regular_line_breaks_in_strings)
871871{
872872 for (auto const & nl: {" \r " s, " \n " s, " \r\n " s})
873873 {
874- TestScanner scanner (" \" abc " + nl + " def\" " );
874+ TestScanner const scanner (" \" abc " + nl + " def\" " );
875875 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
876876 BOOST_CHECK_EQUAL (scanner.next (), Token::Identifier);
877877 BOOST_CHECK_EQUAL (scanner.currentLiteral (), " def" );
@@ -884,7 +884,7 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_strings)
884884{
885885 for (auto const & nl: {" \v " , " \f " , " \xE2\x80\xA8 " , " \xE2\x80\xA9 " })
886886 {
887- TestScanner scanner (" \" abc " + std::string (nl) + " def\" " );
887+ TestScanner const scanner (" \" abc " + std::string (nl) + " def\" " );
888888 BOOST_CHECK_EQUAL (scanner.currentToken (), Token::Illegal);
889889 for (size_t i = 0 ; i < std::string (nl).size (); i++)
890890 BOOST_CHECK_EQUAL (scanner.next (), Token::Illegal);
0 commit comments