diff --git a/src/Codes.h b/src/Codes.h index ddb4bfe11..b9ebdbde9 100644 --- a/src/Codes.h +++ b/src/Codes.h @@ -241,10 +241,10 @@ namespace libcasm_fe OperatorInvalidOperands = 0x8001 // --------------------------------------------------------- b*** ... - // bit type errors + // binary type errors , TypeBitSyntaxError = 0xb000, - TypeBitSizeIsInvalid = 0xb001, + TypeBinarySizeIsInvalid = 0xb001, TypeBitSizeInvalidExpression = 0xb002 , diff --git a/src/GrammarParser.yy b/src/GrammarParser.yy index bf8a3a21b..4e001f504 100644 --- a/src/GrammarParser.yy +++ b/src/GrammarParser.yy @@ -198,7 +198,7 @@ END 0 "end of file" %type Expression Term Literal %type Terms %type TypeCastingExpression -%type BooleanLiteral StringLiteral BitLiteral IntegerLiteral DecimalLiteral RationalLiteral +%type BooleanLiteral StringLiteral BinaryLiteral IntegerLiteral DecimalLiteral RationalLiteral %type ReferenceLiteral %type UndefinedLiteral %type Range @@ -1031,7 +1031,7 @@ Literal { $$ = $1; } -| BitLiteral +| BinaryLiteral { $$ = $1; } @@ -1116,12 +1116,12 @@ DecimalLiteral ; -BitLiteral +BinaryLiteral : BINARY { try { - const auto value = libstdhl::Memory::get< libcasm_ir::BitConstant >( $1, libstdhl::Type::BINARY ); + const auto value = libstdhl::Memory::get< libcasm_ir::BinaryConstant >( $1, libstdhl::Type::BINARY ); $$ = Ast::make< ValueAtom >( @$, value ); } catch( const std::domain_error& e ) @@ -1133,7 +1133,7 @@ BitLiteral { try { - const auto value = libstdhl::Memory::get< libcasm_ir::BitConstant >( $1, libstdhl::Type::HEXADECIMAL ); + const auto value = libstdhl::Memory::get< libcasm_ir::BinaryConstant >( $1, libstdhl::Type::HEXADECIMAL ); $$ = Ast::make< ValueAtom >( @$, value ); } catch( const std::domain_error& e ) diff --git a/src/analyze/TypeCheckPass.cpp b/src/analyze/TypeCheckPass.cpp index b6b150687..56e6d6653 100644 --- a/src/analyze/TypeCheckPass.cpp +++ b/src/analyze/TypeCheckPass.cpp @@ -83,7 +83,7 @@ TypeCheckVisitor::TypeCheckVisitor( libcasm_fe::Logger& log, Namespace& symbolta static const std::string TYPE_STRING_VOID = "Void"; static const std::string TYPE_STRING_BOOLEAN = "Boolean"; -static const std::string TYPE_STRING_BIT = "Bit"; +static const std::string TYPE_STRING_BINARY = "Binary"; static const std::string TYPE_STRING_INTEGER = "Integer"; static const std::string TYPE_STRING_STRING = "String"; static const std::string TYPE_STRING_DECIMAL = "Decimal"; @@ -122,9 +122,9 @@ void TypeCheckVisitor::visit( BasicType& node ) { node.setType( libstdhl::Memory::get< libcasm_ir::BooleanType >() ); } - else if( name == TYPE_STRING_BIT ) + else if( name == TYPE_STRING_BINARY ) // PPA: REMOVE: drop this basic type support, use alias! { - node.setType( libstdhl::Memory::get< libcasm_ir::BitType >( 1 ) ); + node.setType( libstdhl::Memory::get< libcasm_ir::BinaryType >( 1 ) ); } else if( name == TYPE_STRING_INTEGER ) { @@ -306,7 +306,7 @@ void TypeCheckVisitor::visit( FixedSizedType& node ) const auto& name = node.name()->baseName(); auto& expr = *node.size(); - if( name == TYPE_STRING_BIT ) + if( name == TYPE_STRING_BINARY ) { if( expr.id() == Node::ID::VALUE_ATOM and expr.type()->isInteger() ) { @@ -317,19 +317,20 @@ void TypeCheckVisitor::visit( FixedSizedType& node ) try { - auto type = libstdhl::Memory::get< libcasm_ir::BitType >( value ); + auto type = libstdhl::Memory::get< libcasm_ir::BinaryType >( value ); node.setType( type ); } catch( const std::domain_error& e ) { - m_log.error( { expr.sourceLocation() }, e.what(), Code::TypeBitSizeIsInvalid ); + m_log.error( + { expr.sourceLocation() }, e.what(), Code::TypeBinarySizeIsInvalid ); } } else { m_log.error( { expr.sourceLocation() }, - "unsupported expr for 'Bit' type, constant Integer value " + "unsupported expr for 'Binary' type, constant Integer value " "expected" ); } } diff --git a/src/analyze/TypeInferencePass.cpp b/src/analyze/TypeInferencePass.cpp index 892b07a5b..8d6950872 100644 --- a/src/analyze/TypeInferencePass.cpp +++ b/src/analyze/TypeInferencePass.cpp @@ -313,9 +313,9 @@ void TypeInferenceVisitor::visit( TypeCastingExpression& node ) node.setTargetBuiltinId( libcasm_ir::Value::AS_RATIONAL_BUILTIN ); break; } - case libcasm_ir::Type::Kind::BIT: + case libcasm_ir::Type::Kind::BINARY: { - node.setTargetBuiltinId( libcasm_ir::Value::AS_BIT_BUILTIN ); + node.setTargetBuiltinId( libcasm_ir::Value::AS_BINARY_BUILTIN ); break; } case libcasm_ir::Type::Kind::DECIMAL: @@ -1227,16 +1227,16 @@ void TypeInferenceVisitor::assignment( // at run-time } else if( - tyLhs.isBit() and tyRhs.isBit() and - static_cast< const libcasm_ir::BitType& >( tyLhs ).bitsize() >= - static_cast< const libcasm_ir::BitType& >( tyRhs ).bitsize() ) + tyLhs.isBinary() and tyRhs.isBinary() and + static_cast< const libcasm_ir::BinaryType& >( tyLhs ).bitsize() >= + static_cast< const libcasm_ir::BinaryType& >( tyRhs ).bitsize() ) { - // relaxation: mixed bit types are OK as long as + // relaxation: mixed binary types are OK as long as // bitsize(lhs) >= bitsize(rhs) } - else if( tyLhs.isBit() and tyRhs.isInteger() and rhs.id() == Node::ID::VALUE_ATOM ) + else if( tyLhs.isBinary() and tyRhs.isInteger() and rhs.id() == Node::ID::VALUE_ATOM ) { - // relaxation: lhs bit and rhs integer are OK as long as rhs is a + // relaxation: lhs binary and rhs integer are OK as long as rhs is a // integer constant with bitsize(lhs) >= bitsize(rhs) try @@ -1246,7 +1246,7 @@ void TypeInferenceVisitor::assignment( auto constant = std::static_pointer_cast< libcasm_ir::IntegerConstant >( valueAtom.value() ); - const auto value = libstdhl::Memory::get< libcasm_ir::BitConstant >( + const auto value = libstdhl::Memory::get< libcasm_ir::BinaryConstant >( lhs.type()->ptr_result(), static_cast< const libstdhl::Type::Natural& >( constant->value() ) ); diff --git a/src/various/Grammar.txt b/src/various/Grammar.txt index 9a6b80e20..34314a46c 100644 --- a/src/various/Grammar.txt +++ b/src/various/Grammar.txt @@ -436,7 +436,7 @@ Literal ::= UndefinedLiteral | IntegerLiteral | RationalLiteral | DecimalLiteral - | BitLiteral + | BinaryLiteral | StringLiteral | ReferenceLiteral @@ -490,14 +490,14 @@ DecimalLiteral ::= "0[xX][0-9a-fA-F][0-9a-fA-F']*[0-9a-fA-F]*" {{page>:grammar:DecimalLiteral&noheader&nofooter}} -===== BitLiteral ===== +===== BinaryLiteral ===== -BitLiteral ::= "0[bB][01][01']*[01]*" - | "0[xX][0-9a-fA-F][0-9a-fA-F']*[0-9a-fA-F]*" +BinaryLiteral ::= "0[bB][01][01']*[01]*" + | "0[xX][0-9a-fA-F][0-9a-fA-F']*[0-9a-fA-F]*" -{{page>:grammar:BitLiteral&noheader&nofooter}} +{{page>:grammar:BinaryLiteral&noheader&nofooter}} ===== StringLiteral ===== diff --git a/src/various/GrammarParser.cpp b/src/various/GrammarParser.cpp index 635d5936b..12022adba 100644 --- a/src/various/GrammarParser.cpp +++ b/src/various/GrammarParser.cpp @@ -550,7 +550,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral value.move< ValueAtom::Ptr >( that.value ); break; @@ -819,7 +819,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral value.copy< ValueAtom::Ptr >( that.value ); break; @@ -1280,7 +1280,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral yylhs.value.build< ValueAtom::Ptr >(); break; @@ -2743,9 +2743,10 @@ namespace libcasm_fe { try { - const auto value = libstdhl::Memory::get< libcasm_ir::BitConstant >( - yystack_[ 0 ].value.as< std::string >(), - libstdhl::Type::BINARY ); + const auto value = + libstdhl::Memory::get< libcasm_ir::BinaryConstant >( + yystack_[ 0 ].value.as< std::string >(), + libstdhl::Type::BINARY ); yylhs.value.as< ValueAtom::Ptr >() = Ast::make< ValueAtom >( yylhs.location, value ); } @@ -2762,9 +2763,10 @@ namespace libcasm_fe { try { - const auto value = libstdhl::Memory::get< libcasm_ir::BitConstant >( - yystack_[ 0 ].value.as< std::string >(), - libstdhl::Type::HEXADECIMAL ); + const auto value = + libstdhl::Memory::get< libcasm_ir::BinaryConstant >( + yystack_[ 0 ].value.as< std::string >(), + libstdhl::Type::HEXADECIMAL ); yylhs.value.as< ValueAtom::Ptr >() = Ast::make< ValueAtom >( yylhs.location, value ); } @@ -4073,7 +4075,7 @@ namespace libcasm_fe "IntegerLiteral", "RationalLiteral", "DecimalLiteral", - "BitLiteral", + "BinaryLiteral", "StringLiteral", "ReferenceLiteral", "Types", diff --git a/src/various/GrammarParser.dot b/src/various/GrammarParser.dot index 7b1353db5..bc96d6ab5 100644 --- a/src/various/GrammarParser.dot +++ b/src/various/GrammarParser.dot @@ -89,7 +89,7 @@ digraph "../../obj/src/GrammarParser.yy" 7 -> 64 [style=dashed label="IntegerLiteral"] 7 -> 65 [style=dashed label="RationalLiteral"] 7 -> 66 [style=dashed label="DecimalLiteral"] - 7 -> 67 [style=dashed label="BitLiteral"] + 7 -> 67 [style=dashed label="BinaryLiteral"] 7 -> 68 [style=dashed label="StringLiteral"] 7 -> 69 [style=dashed label="ReferenceLiteral"] 7 -> 70 [style=dashed label="Identifier"] @@ -251,7 +251,7 @@ digraph "../../obj/src/GrammarParser.yy" 31 -> 64 [style=dashed label="IntegerLiteral"] 31 -> 65 [style=dashed label="RationalLiteral"] 31 -> 66 [style=dashed label="DecimalLiteral"] - 31 -> 67 [style=dashed label="BitLiteral"] + 31 -> 67 [style=dashed label="BinaryLiteral"] 31 -> 68 [style=dashed label="StringLiteral"] 31 -> 69 [style=dashed label="ReferenceLiteral"] 31 -> 70 [style=dashed label="Identifier"] @@ -316,7 +316,7 @@ digraph "../../obj/src/GrammarParser.yy" 36 -> 64 [style=dashed label="IntegerLiteral"] 36 -> 65 [style=dashed label="RationalLiteral"] 36 -> 66 [style=dashed label="DecimalLiteral"] - 36 -> 67 [style=dashed label="BitLiteral"] + 36 -> 67 [style=dashed label="BinaryLiteral"] 36 -> 68 [style=dashed label="StringLiteral"] 36 -> 69 [style=dashed label="ReferenceLiteral"] 36 -> 70 [style=dashed label="Identifier"] @@ -364,7 +364,7 @@ digraph "../../obj/src/GrammarParser.yy" 37 -> 64 [style=dashed label="IntegerLiteral"] 37 -> 65 [style=dashed label="RationalLiteral"] 37 -> 66 [style=dashed label="DecimalLiteral"] - 37 -> 67 [style=dashed label="BitLiteral"] + 37 -> 67 [style=dashed label="BinaryLiteral"] 37 -> 68 [style=dashed label="StringLiteral"] 37 -> 69 [style=dashed label="ReferenceLiteral"] 37 -> 70 [style=dashed label="Identifier"] @@ -412,7 +412,7 @@ digraph "../../obj/src/GrammarParser.yy" 38 -> 64 [style=dashed label="IntegerLiteral"] 38 -> 65 [style=dashed label="RationalLiteral"] 38 -> 66 [style=dashed label="DecimalLiteral"] - 38 -> 67 [style=dashed label="BitLiteral"] + 38 -> 67 [style=dashed label="BinaryLiteral"] 38 -> 68 [style=dashed label="StringLiteral"] 38 -> 69 [style=dashed label="ReferenceLiteral"] 38 -> 70 [style=dashed label="Identifier"] @@ -462,7 +462,7 @@ digraph "../../obj/src/GrammarParser.yy" 39 -> 64 [style=dashed label="IntegerLiteral"] 39 -> 65 [style=dashed label="RationalLiteral"] 39 -> 66 [style=dashed label="DecimalLiteral"] - 39 -> 67 [style=dashed label="BitLiteral"] + 39 -> 67 [style=dashed label="BinaryLiteral"] 39 -> 68 [style=dashed label="StringLiteral"] 39 -> 69 [style=dashed label="ReferenceLiteral"] 39 -> 70 [style=dashed label="Identifier"] @@ -513,7 +513,7 @@ digraph "../../obj/src/GrammarParser.yy" 40 -> 64 [style=dashed label="IntegerLiteral"] 40 -> 65 [style=dashed label="RationalLiteral"] 40 -> 66 [style=dashed label="DecimalLiteral"] - 40 -> 67 [style=dashed label="BitLiteral"] + 40 -> 67 [style=dashed label="BinaryLiteral"] 40 -> 68 [style=dashed label="StringLiteral"] 40 -> 69 [style=dashed label="ReferenceLiteral"] 40 -> 70 [style=dashed label="Identifier"] @@ -530,10 +530,10 @@ digraph "../../obj/src/GrammarParser.yy" 42 -> 5 [style=solid label="\"in\""] 42 -> 6 [style=solid label="\"identifier\""] 42 -> 103 [style=dashed label="Identifier"] - 43 [label="State 43\n\l130 BitLiteral: \"binary\" .\l"] + 43 [label="State 43\n\l130 BinaryLiteral: \"binary\" .\l"] 43 -> "43R130" [style=solid] "43R130" [label="R130", fillcolor=3, shape=diamond, style=filled] - 44 [label="State 44\n\l131 BitLiteral: \"hexadecimal\" .\l"] + 44 [label="State 44\n\l131 BinaryLiteral: \"hexadecimal\" .\l"] 44 -> "44R131" [style=solid] "44R131" [label="R131", fillcolor=3, shape=diamond, style=filled] 45 [label="State 45\n\l127 IntegerLiteral: \"integer\" .\l"] @@ -620,7 +620,7 @@ digraph "../../obj/src/GrammarParser.yy" 66 [label="State 66\n\l120 Literal: DecimalLiteral .\l"] 66 -> "66R120" [style=solid] "66R120" [label="R120", fillcolor=3, shape=diamond, style=filled] - 67 [label="State 67\n\l121 Literal: BitLiteral .\l"] + 67 [label="State 67\n\l121 Literal: BinaryLiteral .\l"] 67 -> "67R121" [style=solid] "67R121" [label="R121", fillcolor=3, shape=diamond, style=filled] 68 [label="State 68\n\l122 Literal: StringLiteral .\l"] @@ -692,7 +692,7 @@ digraph "../../obj/src/GrammarParser.yy" 75 -> 64 [style=dashed label="IntegerLiteral"] 75 -> 65 [style=dashed label="RationalLiteral"] 75 -> 66 [style=dashed label="DecimalLiteral"] - 75 -> 67 [style=dashed label="BitLiteral"] + 75 -> 67 [style=dashed label="BinaryLiteral"] 75 -> 68 [style=dashed label="StringLiteral"] 75 -> 69 [style=dashed label="ReferenceLiteral"] 75 -> 129 [style=dashed label="TwoOrMoreArguments"] @@ -826,7 +826,7 @@ digraph "../../obj/src/GrammarParser.yy" 96 -> 64 [style=dashed label="IntegerLiteral"] 96 -> 65 [style=dashed label="RationalLiteral"] 96 -> 66 [style=dashed label="DecimalLiteral"] - 96 -> 67 [style=dashed label="BitLiteral"] + 96 -> 67 [style=dashed label="BinaryLiteral"] 96 -> 68 [style=dashed label="StringLiteral"] 96 -> 69 [style=dashed label="ReferenceLiteral"] 96 -> 70 [style=dashed label="Identifier"] @@ -942,7 +942,7 @@ digraph "../../obj/src/GrammarParser.yy" 105 -> 64 [style=dashed label="IntegerLiteral"] 105 -> 65 [style=dashed label="RationalLiteral"] 105 -> 66 [style=dashed label="DecimalLiteral"] - 105 -> 67 [style=dashed label="BitLiteral"] + 105 -> 67 [style=dashed label="BinaryLiteral"] 105 -> 68 [style=dashed label="StringLiteral"] 105 -> 69 [style=dashed label="ReferenceLiteral"] 105 -> 70 [style=dashed label="Identifier"] @@ -990,7 +990,7 @@ digraph "../../obj/src/GrammarParser.yy" 106 -> 64 [style=dashed label="IntegerLiteral"] 106 -> 65 [style=dashed label="RationalLiteral"] 106 -> 66 [style=dashed label="DecimalLiteral"] - 106 -> 67 [style=dashed label="BitLiteral"] + 106 -> 67 [style=dashed label="BinaryLiteral"] 106 -> 68 [style=dashed label="StringLiteral"] 106 -> 69 [style=dashed label="ReferenceLiteral"] 106 -> 70 [style=dashed label="Identifier"] @@ -1038,7 +1038,7 @@ digraph "../../obj/src/GrammarParser.yy" 107 -> 64 [style=dashed label="IntegerLiteral"] 107 -> 65 [style=dashed label="RationalLiteral"] 107 -> 66 [style=dashed label="DecimalLiteral"] - 107 -> 67 [style=dashed label="BitLiteral"] + 107 -> 67 [style=dashed label="BinaryLiteral"] 107 -> 68 [style=dashed label="StringLiteral"] 107 -> 69 [style=dashed label="ReferenceLiteral"] 107 -> 70 [style=dashed label="Identifier"] @@ -1086,7 +1086,7 @@ digraph "../../obj/src/GrammarParser.yy" 108 -> 64 [style=dashed label="IntegerLiteral"] 108 -> 65 [style=dashed label="RationalLiteral"] 108 -> 66 [style=dashed label="DecimalLiteral"] - 108 -> 67 [style=dashed label="BitLiteral"] + 108 -> 67 [style=dashed label="BinaryLiteral"] 108 -> 68 [style=dashed label="StringLiteral"] 108 -> 69 [style=dashed label="ReferenceLiteral"] 108 -> 70 [style=dashed label="Identifier"] @@ -1134,7 +1134,7 @@ digraph "../../obj/src/GrammarParser.yy" 109 -> 64 [style=dashed label="IntegerLiteral"] 109 -> 65 [style=dashed label="RationalLiteral"] 109 -> 66 [style=dashed label="DecimalLiteral"] - 109 -> 67 [style=dashed label="BitLiteral"] + 109 -> 67 [style=dashed label="BinaryLiteral"] 109 -> 68 [style=dashed label="StringLiteral"] 109 -> 69 [style=dashed label="ReferenceLiteral"] 109 -> 70 [style=dashed label="Identifier"] @@ -1182,7 +1182,7 @@ digraph "../../obj/src/GrammarParser.yy" 110 -> 64 [style=dashed label="IntegerLiteral"] 110 -> 65 [style=dashed label="RationalLiteral"] 110 -> 66 [style=dashed label="DecimalLiteral"] - 110 -> 67 [style=dashed label="BitLiteral"] + 110 -> 67 [style=dashed label="BinaryLiteral"] 110 -> 68 [style=dashed label="StringLiteral"] 110 -> 69 [style=dashed label="ReferenceLiteral"] 110 -> 70 [style=dashed label="Identifier"] @@ -1230,7 +1230,7 @@ digraph "../../obj/src/GrammarParser.yy" 111 -> 64 [style=dashed label="IntegerLiteral"] 111 -> 65 [style=dashed label="RationalLiteral"] 111 -> 66 [style=dashed label="DecimalLiteral"] - 111 -> 67 [style=dashed label="BitLiteral"] + 111 -> 67 [style=dashed label="BinaryLiteral"] 111 -> 68 [style=dashed label="StringLiteral"] 111 -> 69 [style=dashed label="ReferenceLiteral"] 111 -> 70 [style=dashed label="Identifier"] @@ -1278,7 +1278,7 @@ digraph "../../obj/src/GrammarParser.yy" 112 -> 64 [style=dashed label="IntegerLiteral"] 112 -> 65 [style=dashed label="RationalLiteral"] 112 -> 66 [style=dashed label="DecimalLiteral"] - 112 -> 67 [style=dashed label="BitLiteral"] + 112 -> 67 [style=dashed label="BinaryLiteral"] 112 -> 68 [style=dashed label="StringLiteral"] 112 -> 69 [style=dashed label="ReferenceLiteral"] 112 -> 70 [style=dashed label="Identifier"] @@ -1326,7 +1326,7 @@ digraph "../../obj/src/GrammarParser.yy" 113 -> 64 [style=dashed label="IntegerLiteral"] 113 -> 65 [style=dashed label="RationalLiteral"] 113 -> 66 [style=dashed label="DecimalLiteral"] - 113 -> 67 [style=dashed label="BitLiteral"] + 113 -> 67 [style=dashed label="BinaryLiteral"] 113 -> 68 [style=dashed label="StringLiteral"] 113 -> 69 [style=dashed label="ReferenceLiteral"] 113 -> 70 [style=dashed label="Identifier"] @@ -1374,7 +1374,7 @@ digraph "../../obj/src/GrammarParser.yy" 114 -> 64 [style=dashed label="IntegerLiteral"] 114 -> 65 [style=dashed label="RationalLiteral"] 114 -> 66 [style=dashed label="DecimalLiteral"] - 114 -> 67 [style=dashed label="BitLiteral"] + 114 -> 67 [style=dashed label="BinaryLiteral"] 114 -> 68 [style=dashed label="StringLiteral"] 114 -> 69 [style=dashed label="ReferenceLiteral"] 114 -> 70 [style=dashed label="Identifier"] @@ -1422,7 +1422,7 @@ digraph "../../obj/src/GrammarParser.yy" 115 -> 64 [style=dashed label="IntegerLiteral"] 115 -> 65 [style=dashed label="RationalLiteral"] 115 -> 66 [style=dashed label="DecimalLiteral"] - 115 -> 67 [style=dashed label="BitLiteral"] + 115 -> 67 [style=dashed label="BinaryLiteral"] 115 -> 68 [style=dashed label="StringLiteral"] 115 -> 69 [style=dashed label="ReferenceLiteral"] 115 -> 70 [style=dashed label="Identifier"] @@ -1470,7 +1470,7 @@ digraph "../../obj/src/GrammarParser.yy" 116 -> 64 [style=dashed label="IntegerLiteral"] 116 -> 65 [style=dashed label="RationalLiteral"] 116 -> 66 [style=dashed label="DecimalLiteral"] - 116 -> 67 [style=dashed label="BitLiteral"] + 116 -> 67 [style=dashed label="BinaryLiteral"] 116 -> 68 [style=dashed label="StringLiteral"] 116 -> 69 [style=dashed label="ReferenceLiteral"] 116 -> 70 [style=dashed label="Identifier"] @@ -1518,7 +1518,7 @@ digraph "../../obj/src/GrammarParser.yy" 117 -> 64 [style=dashed label="IntegerLiteral"] 117 -> 65 [style=dashed label="RationalLiteral"] 117 -> 66 [style=dashed label="DecimalLiteral"] - 117 -> 67 [style=dashed label="BitLiteral"] + 117 -> 67 [style=dashed label="BinaryLiteral"] 117 -> 68 [style=dashed label="StringLiteral"] 117 -> 69 [style=dashed label="ReferenceLiteral"] 117 -> 70 [style=dashed label="Identifier"] @@ -1566,7 +1566,7 @@ digraph "../../obj/src/GrammarParser.yy" 118 -> 64 [style=dashed label="IntegerLiteral"] 118 -> 65 [style=dashed label="RationalLiteral"] 118 -> 66 [style=dashed label="DecimalLiteral"] - 118 -> 67 [style=dashed label="BitLiteral"] + 118 -> 67 [style=dashed label="BinaryLiteral"] 118 -> 68 [style=dashed label="StringLiteral"] 118 -> 69 [style=dashed label="ReferenceLiteral"] 118 -> 70 [style=dashed label="Identifier"] @@ -1614,7 +1614,7 @@ digraph "../../obj/src/GrammarParser.yy" 119 -> 64 [style=dashed label="IntegerLiteral"] 119 -> 65 [style=dashed label="RationalLiteral"] 119 -> 66 [style=dashed label="DecimalLiteral"] - 119 -> 67 [style=dashed label="BitLiteral"] + 119 -> 67 [style=dashed label="BinaryLiteral"] 119 -> 68 [style=dashed label="StringLiteral"] 119 -> 69 [style=dashed label="ReferenceLiteral"] 119 -> 70 [style=dashed label="Identifier"] @@ -1662,7 +1662,7 @@ digraph "../../obj/src/GrammarParser.yy" 120 -> 64 [style=dashed label="IntegerLiteral"] 120 -> 65 [style=dashed label="RationalLiteral"] 120 -> 66 [style=dashed label="DecimalLiteral"] - 120 -> 67 [style=dashed label="BitLiteral"] + 120 -> 67 [style=dashed label="BinaryLiteral"] 120 -> 68 [style=dashed label="StringLiteral"] 120 -> 69 [style=dashed label="ReferenceLiteral"] 120 -> 70 [style=dashed label="Identifier"] @@ -1710,7 +1710,7 @@ digraph "../../obj/src/GrammarParser.yy" 121 -> 64 [style=dashed label="IntegerLiteral"] 121 -> 65 [style=dashed label="RationalLiteral"] 121 -> 66 [style=dashed label="DecimalLiteral"] - 121 -> 67 [style=dashed label="BitLiteral"] + 121 -> 67 [style=dashed label="BinaryLiteral"] 121 -> 68 [style=dashed label="StringLiteral"] 121 -> 69 [style=dashed label="ReferenceLiteral"] 121 -> 70 [style=dashed label="Identifier"] @@ -1761,7 +1761,7 @@ digraph "../../obj/src/GrammarParser.yy" 122 -> 64 [style=dashed label="IntegerLiteral"] 122 -> 65 [style=dashed label="RationalLiteral"] 122 -> 66 [style=dashed label="DecimalLiteral"] - 122 -> 67 [style=dashed label="BitLiteral"] + 122 -> 67 [style=dashed label="BinaryLiteral"] 122 -> 68 [style=dashed label="StringLiteral"] 122 -> 69 [style=dashed label="ReferenceLiteral"] 122 -> 70 [style=dashed label="Identifier"] @@ -1825,7 +1825,7 @@ digraph "../../obj/src/GrammarParser.yy" 127 -> 64 [style=dashed label="IntegerLiteral"] 127 -> 65 [style=dashed label="RationalLiteral"] 127 -> 66 [style=dashed label="DecimalLiteral"] - 127 -> 67 [style=dashed label="BitLiteral"] + 127 -> 67 [style=dashed label="BinaryLiteral"] 127 -> 68 [style=dashed label="StringLiteral"] 127 -> 69 [style=dashed label="ReferenceLiteral"] 127 -> 70 [style=dashed label="Identifier"] @@ -1965,7 +1965,7 @@ digraph "../../obj/src/GrammarParser.yy" 141 -> 64 [style=dashed label="IntegerLiteral"] 141 -> 65 [style=dashed label="RationalLiteral"] 141 -> 66 [style=dashed label="DecimalLiteral"] - 141 -> 67 [style=dashed label="BitLiteral"] + 141 -> 67 [style=dashed label="BinaryLiteral"] 141 -> 68 [style=dashed label="StringLiteral"] 141 -> 69 [style=dashed label="ReferenceLiteral"] 141 -> 70 [style=dashed label="Identifier"] @@ -2013,7 +2013,7 @@ digraph "../../obj/src/GrammarParser.yy" 142 -> 64 [style=dashed label="IntegerLiteral"] 142 -> 65 [style=dashed label="RationalLiteral"] 142 -> 66 [style=dashed label="DecimalLiteral"] - 142 -> 67 [style=dashed label="BitLiteral"] + 142 -> 67 [style=dashed label="BinaryLiteral"] 142 -> 68 [style=dashed label="StringLiteral"] 142 -> 69 [style=dashed label="ReferenceLiteral"] 142 -> 70 [style=dashed label="Identifier"] @@ -2061,7 +2061,7 @@ digraph "../../obj/src/GrammarParser.yy" 143 -> 64 [style=dashed label="IntegerLiteral"] 143 -> 65 [style=dashed label="RationalLiteral"] 143 -> 66 [style=dashed label="DecimalLiteral"] - 143 -> 67 [style=dashed label="BitLiteral"] + 143 -> 67 [style=dashed label="BinaryLiteral"] 143 -> 68 [style=dashed label="StringLiteral"] 143 -> 69 [style=dashed label="ReferenceLiteral"] 143 -> 70 [style=dashed label="Identifier"] @@ -2109,7 +2109,7 @@ digraph "../../obj/src/GrammarParser.yy" 144 -> 64 [style=dashed label="IntegerLiteral"] 144 -> 65 [style=dashed label="RationalLiteral"] 144 -> 66 [style=dashed label="DecimalLiteral"] - 144 -> 67 [style=dashed label="BitLiteral"] + 144 -> 67 [style=dashed label="BinaryLiteral"] 144 -> 68 [style=dashed label="StringLiteral"] 144 -> 69 [style=dashed label="ReferenceLiteral"] 144 -> 70 [style=dashed label="Identifier"] @@ -2157,7 +2157,7 @@ digraph "../../obj/src/GrammarParser.yy" 145 -> 64 [style=dashed label="IntegerLiteral"] 145 -> 65 [style=dashed label="RationalLiteral"] 145 -> 66 [style=dashed label="DecimalLiteral"] - 145 -> 67 [style=dashed label="BitLiteral"] + 145 -> 67 [style=dashed label="BinaryLiteral"] 145 -> 68 [style=dashed label="StringLiteral"] 145 -> 69 [style=dashed label="ReferenceLiteral"] 145 -> 70 [style=dashed label="Identifier"] @@ -2237,7 +2237,7 @@ digraph "../../obj/src/GrammarParser.yy" 151 -> 64 [style=dashed label="IntegerLiteral"] 151 -> 65 [style=dashed label="RationalLiteral"] 151 -> 66 [style=dashed label="DecimalLiteral"] - 151 -> 67 [style=dashed label="BitLiteral"] + 151 -> 67 [style=dashed label="BinaryLiteral"] 151 -> 68 [style=dashed label="StringLiteral"] 151 -> 69 [style=dashed label="ReferenceLiteral"] 151 -> 70 [style=dashed label="Identifier"] @@ -2285,7 +2285,7 @@ digraph "../../obj/src/GrammarParser.yy" 152 -> 64 [style=dashed label="IntegerLiteral"] 152 -> 65 [style=dashed label="RationalLiteral"] 152 -> 66 [style=dashed label="DecimalLiteral"] - 152 -> 67 [style=dashed label="BitLiteral"] + 152 -> 67 [style=dashed label="BinaryLiteral"] 152 -> 68 [style=dashed label="StringLiteral"] 152 -> 69 [style=dashed label="ReferenceLiteral"] 152 -> 70 [style=dashed label="Identifier"] @@ -2586,7 +2586,7 @@ digraph "../../obj/src/GrammarParser.yy" 183 -> 64 [style=dashed label="IntegerLiteral"] 183 -> 65 [style=dashed label="RationalLiteral"] 183 -> 66 [style=dashed label="DecimalLiteral"] - 183 -> 67 [style=dashed label="BitLiteral"] + 183 -> 67 [style=dashed label="BinaryLiteral"] 183 -> 68 [style=dashed label="StringLiteral"] 183 -> 69 [style=dashed label="ReferenceLiteral"] 183 -> 70 [style=dashed label="Identifier"] @@ -2634,7 +2634,7 @@ digraph "../../obj/src/GrammarParser.yy" 184 -> 64 [style=dashed label="IntegerLiteral"] 184 -> 65 [style=dashed label="RationalLiteral"] 184 -> 66 [style=dashed label="DecimalLiteral"] - 184 -> 67 [style=dashed label="BitLiteral"] + 184 -> 67 [style=dashed label="BinaryLiteral"] 184 -> 68 [style=dashed label="StringLiteral"] 184 -> 69 [style=dashed label="ReferenceLiteral"] 184 -> 70 [style=dashed label="Identifier"] @@ -2682,7 +2682,7 @@ digraph "../../obj/src/GrammarParser.yy" 185 -> 64 [style=dashed label="IntegerLiteral"] 185 -> 65 [style=dashed label="RationalLiteral"] 185 -> 66 [style=dashed label="DecimalLiteral"] - 185 -> 67 [style=dashed label="BitLiteral"] + 185 -> 67 [style=dashed label="BinaryLiteral"] 185 -> 68 [style=dashed label="StringLiteral"] 185 -> 69 [style=dashed label="ReferenceLiteral"] 185 -> 129 [style=dashed label="TwoOrMoreArguments"] @@ -3004,7 +3004,7 @@ digraph "../../obj/src/GrammarParser.yy" 212 -> 64 [style=dashed label="IntegerLiteral"] 212 -> 65 [style=dashed label="RationalLiteral"] 212 -> 66 [style=dashed label="DecimalLiteral"] - 212 -> 67 [style=dashed label="BitLiteral"] + 212 -> 67 [style=dashed label="BinaryLiteral"] 212 -> 68 [style=dashed label="StringLiteral"] 212 -> 69 [style=dashed label="ReferenceLiteral"] 212 -> 70 [style=dashed label="Identifier"] @@ -3058,7 +3058,7 @@ digraph "../../obj/src/GrammarParser.yy" 215 -> 64 [style=dashed label="IntegerLiteral"] 215 -> 65 [style=dashed label="RationalLiteral"] 215 -> 66 [style=dashed label="DecimalLiteral"] - 215 -> 67 [style=dashed label="BitLiteral"] + 215 -> 67 [style=dashed label="BinaryLiteral"] 215 -> 68 [style=dashed label="StringLiteral"] 215 -> 69 [style=dashed label="ReferenceLiteral"] 215 -> 70 [style=dashed label="Identifier"] @@ -3332,7 +3332,7 @@ digraph "../../obj/src/GrammarParser.yy" 237 -> 64 [style=dashed label="IntegerLiteral"] 237 -> 65 [style=dashed label="RationalLiteral"] 237 -> 66 [style=dashed label="DecimalLiteral"] - 237 -> 67 [style=dashed label="BitLiteral"] + 237 -> 67 [style=dashed label="BinaryLiteral"] 237 -> 68 [style=dashed label="StringLiteral"] 237 -> 69 [style=dashed label="ReferenceLiteral"] 237 -> 70 [style=dashed label="Identifier"] @@ -3380,7 +3380,7 @@ digraph "../../obj/src/GrammarParser.yy" 238 -> 64 [style=dashed label="IntegerLiteral"] 238 -> 65 [style=dashed label="RationalLiteral"] 238 -> 66 [style=dashed label="DecimalLiteral"] - 238 -> 67 [style=dashed label="BitLiteral"] + 238 -> 67 [style=dashed label="BinaryLiteral"] 238 -> 68 [style=dashed label="StringLiteral"] 238 -> 69 [style=dashed label="ReferenceLiteral"] 238 -> 70 [style=dashed label="Identifier"] @@ -3574,7 +3574,7 @@ digraph "../../obj/src/GrammarParser.yy" 260 -> 64 [style=dashed label="IntegerLiteral"] 260 -> 65 [style=dashed label="RationalLiteral"] 260 -> 66 [style=dashed label="DecimalLiteral"] - 260 -> 67 [style=dashed label="BitLiteral"] + 260 -> 67 [style=dashed label="BinaryLiteral"] 260 -> 68 [style=dashed label="StringLiteral"] 260 -> 69 [style=dashed label="ReferenceLiteral"] 260 -> 70 [style=dashed label="Identifier"] @@ -3622,7 +3622,7 @@ digraph "../../obj/src/GrammarParser.yy" 261 -> 64 [style=dashed label="IntegerLiteral"] 261 -> 65 [style=dashed label="RationalLiteral"] 261 -> 66 [style=dashed label="DecimalLiteral"] - 261 -> 67 [style=dashed label="BitLiteral"] + 261 -> 67 [style=dashed label="BinaryLiteral"] 261 -> 68 [style=dashed label="StringLiteral"] 261 -> 69 [style=dashed label="ReferenceLiteral"] 261 -> 70 [style=dashed label="Identifier"] @@ -3670,7 +3670,7 @@ digraph "../../obj/src/GrammarParser.yy" 262 -> 64 [style=dashed label="IntegerLiteral"] 262 -> 65 [style=dashed label="RationalLiteral"] 262 -> 66 [style=dashed label="DecimalLiteral"] - 262 -> 67 [style=dashed label="BitLiteral"] + 262 -> 67 [style=dashed label="BinaryLiteral"] 262 -> 68 [style=dashed label="StringLiteral"] 262 -> 69 [style=dashed label="ReferenceLiteral"] 262 -> 70 [style=dashed label="Identifier"] @@ -3718,7 +3718,7 @@ digraph "../../obj/src/GrammarParser.yy" 263 -> 64 [style=dashed label="IntegerLiteral"] 263 -> 65 [style=dashed label="RationalLiteral"] 263 -> 66 [style=dashed label="DecimalLiteral"] - 263 -> 67 [style=dashed label="BitLiteral"] + 263 -> 67 [style=dashed label="BinaryLiteral"] 263 -> 68 [style=dashed label="StringLiteral"] 263 -> 69 [style=dashed label="ReferenceLiteral"] 263 -> 70 [style=dashed label="Identifier"] @@ -3766,7 +3766,7 @@ digraph "../../obj/src/GrammarParser.yy" 264 -> 64 [style=dashed label="IntegerLiteral"] 264 -> 65 [style=dashed label="RationalLiteral"] 264 -> 66 [style=dashed label="DecimalLiteral"] - 264 -> 67 [style=dashed label="BitLiteral"] + 264 -> 67 [style=dashed label="BinaryLiteral"] 264 -> 68 [style=dashed label="StringLiteral"] 264 -> 69 [style=dashed label="ReferenceLiteral"] 264 -> 70 [style=dashed label="Identifier"] @@ -3863,7 +3863,7 @@ digraph "../../obj/src/GrammarParser.yy" 274 -> 64 [style=dashed label="IntegerLiteral"] 274 -> 65 [style=dashed label="RationalLiteral"] 274 -> 66 [style=dashed label="DecimalLiteral"] - 274 -> 67 [style=dashed label="BitLiteral"] + 274 -> 67 [style=dashed label="BinaryLiteral"] 274 -> 68 [style=dashed label="StringLiteral"] 274 -> 69 [style=dashed label="ReferenceLiteral"] 274 -> 70 [style=dashed label="Identifier"] @@ -4130,7 +4130,7 @@ digraph "../../obj/src/GrammarParser.yy" 295 -> 64 [style=dashed label="IntegerLiteral"] 295 -> 65 [style=dashed label="RationalLiteral"] 295 -> 66 [style=dashed label="DecimalLiteral"] - 295 -> 67 [style=dashed label="BitLiteral"] + 295 -> 67 [style=dashed label="BinaryLiteral"] 295 -> 68 [style=dashed label="StringLiteral"] 295 -> 69 [style=dashed label="ReferenceLiteral"] 295 -> 70 [style=dashed label="Identifier"] @@ -4401,7 +4401,7 @@ digraph "../../obj/src/GrammarParser.yy" 317 -> 64 [style=dashed label="IntegerLiteral"] 317 -> 65 [style=dashed label="RationalLiteral"] 317 -> 66 [style=dashed label="DecimalLiteral"] - 317 -> 67 [style=dashed label="BitLiteral"] + 317 -> 67 [style=dashed label="BinaryLiteral"] 317 -> 68 [style=dashed label="StringLiteral"] 317 -> 69 [style=dashed label="ReferenceLiteral"] 317 -> 70 [style=dashed label="Identifier"] @@ -4449,7 +4449,7 @@ digraph "../../obj/src/GrammarParser.yy" 318 -> 64 [style=dashed label="IntegerLiteral"] 318 -> 65 [style=dashed label="RationalLiteral"] 318 -> 66 [style=dashed label="DecimalLiteral"] - 318 -> 67 [style=dashed label="BitLiteral"] + 318 -> 67 [style=dashed label="BinaryLiteral"] 318 -> 68 [style=dashed label="StringLiteral"] 318 -> 69 [style=dashed label="ReferenceLiteral"] 318 -> 70 [style=dashed label="Identifier"] @@ -4497,7 +4497,7 @@ digraph "../../obj/src/GrammarParser.yy" 319 -> 64 [style=dashed label="IntegerLiteral"] 319 -> 65 [style=dashed label="RationalLiteral"] 319 -> 66 [style=dashed label="DecimalLiteral"] - 319 -> 67 [style=dashed label="BitLiteral"] + 319 -> 67 [style=dashed label="BinaryLiteral"] 319 -> 68 [style=dashed label="StringLiteral"] 319 -> 69 [style=dashed label="ReferenceLiteral"] 319 -> 70 [style=dashed label="Identifier"] @@ -4702,7 +4702,7 @@ digraph "../../obj/src/GrammarParser.yy" 337 -> 64 [style=dashed label="IntegerLiteral"] 337 -> 65 [style=dashed label="RationalLiteral"] 337 -> 66 [style=dashed label="DecimalLiteral"] - 337 -> 67 [style=dashed label="BitLiteral"] + 337 -> 67 [style=dashed label="BinaryLiteral"] 337 -> 68 [style=dashed label="StringLiteral"] 337 -> 69 [style=dashed label="ReferenceLiteral"] 337 -> 70 [style=dashed label="Identifier"] @@ -4750,7 +4750,7 @@ digraph "../../obj/src/GrammarParser.yy" 338 -> 64 [style=dashed label="IntegerLiteral"] 338 -> 65 [style=dashed label="RationalLiteral"] 338 -> 66 [style=dashed label="DecimalLiteral"] - 338 -> 67 [style=dashed label="BitLiteral"] + 338 -> 67 [style=dashed label="BinaryLiteral"] 338 -> 68 [style=dashed label="StringLiteral"] 338 -> 69 [style=dashed label="ReferenceLiteral"] 338 -> 70 [style=dashed label="Identifier"] @@ -4874,7 +4874,7 @@ digraph "../../obj/src/GrammarParser.yy" 344 -> 64 [style=dashed label="IntegerLiteral"] 344 -> 65 [style=dashed label="RationalLiteral"] 344 -> 66 [style=dashed label="DecimalLiteral"] - 344 -> 67 [style=dashed label="BitLiteral"] + 344 -> 67 [style=dashed label="BinaryLiteral"] 344 -> 68 [style=dashed label="StringLiteral"] 344 -> 69 [style=dashed label="ReferenceLiteral"] 344 -> 70 [style=dashed label="Identifier"] @@ -5003,7 +5003,7 @@ digraph "../../obj/src/GrammarParser.yy" 351 -> 64 [style=dashed label="IntegerLiteral"] 351 -> 65 [style=dashed label="RationalLiteral"] 351 -> 66 [style=dashed label="DecimalLiteral"] - 351 -> 67 [style=dashed label="BitLiteral"] + 351 -> 67 [style=dashed label="BinaryLiteral"] 351 -> 68 [style=dashed label="StringLiteral"] 351 -> 69 [style=dashed label="ReferenceLiteral"] 351 -> 70 [style=dashed label="Identifier"] @@ -5091,7 +5091,7 @@ digraph "../../obj/src/GrammarParser.yy" 354 -> 64 [style=dashed label="IntegerLiteral"] 354 -> 65 [style=dashed label="RationalLiteral"] 354 -> 66 [style=dashed label="DecimalLiteral"] - 354 -> 67 [style=dashed label="BitLiteral"] + 354 -> 67 [style=dashed label="BinaryLiteral"] 354 -> 68 [style=dashed label="StringLiteral"] 354 -> 69 [style=dashed label="ReferenceLiteral"] 354 -> 129 [style=dashed label="TwoOrMoreArguments"] diff --git a/src/various/GrammarParser.output b/src/various/GrammarParser.output index 1d3f58fe1..c8b8d001a 100644 --- a/src/various/GrammarParser.output +++ b/src/various/GrammarParser.output @@ -165,7 +165,7 @@ Grammar 118 | IntegerLiteral 119 | RationalLiteral 120 | DecimalLiteral - 121 | BitLiteral + 121 | BinaryLiteral 122 | StringLiteral 123 | ReferenceLiteral @@ -180,8 +180,8 @@ Grammar 129 DecimalLiteral: "decimal" - 130 BitLiteral: "binary" - 131 | "hexadecimal" + 130 BinaryLiteral: "binary" + 131 | "hexadecimal" 132 StringLiteral: "string" @@ -455,7 +455,7 @@ RationalLiteral (127) on left: 128, on right: 119 DecimalLiteral (128) on left: 129, on right: 120 -BitLiteral (129) +BinaryLiteral (129) on left: 130 131, on right: 121 StringLiteral (130) on left: 132, on right: 122 @@ -645,7 +645,7 @@ State 7 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -928,7 +928,7 @@ State 31 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -1017,7 +1017,7 @@ State 36 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -1071,7 +1071,7 @@ State 37 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -1125,7 +1125,7 @@ State 38 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -1183,7 +1183,7 @@ State 39 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -1243,7 +1243,7 @@ State 40 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -1276,16 +1276,16 @@ State 42 State 43 - 130 BitLiteral: "binary" . + 130 BinaryLiteral: "binary" . - $default reduce using rule 130 (BitLiteral) + $default reduce using rule 130 (BinaryLiteral) State 44 - 131 BitLiteral: "hexadecimal" . + 131 BinaryLiteral: "hexadecimal" . - $default reduce using rule 131 (BitLiteral) + $default reduce using rule 131 (BinaryLiteral) State 45 @@ -1481,7 +1481,7 @@ State 66 State 67 - 121 Literal: BitLiteral . + 121 Literal: BinaryLiteral . $default reduce using rule 121 (Literal) @@ -1597,7 +1597,7 @@ State 75 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 TwoOrMoreArguments go to state 129 @@ -1906,7 +1906,7 @@ State 96 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2104,7 +2104,7 @@ State 105 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2158,7 +2158,7 @@ State 106 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2212,7 +2212,7 @@ State 107 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2266,7 +2266,7 @@ State 108 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2320,7 +2320,7 @@ State 109 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2374,7 +2374,7 @@ State 110 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2428,7 +2428,7 @@ State 111 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2482,7 +2482,7 @@ State 112 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2536,7 +2536,7 @@ State 113 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2590,7 +2590,7 @@ State 114 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2644,7 +2644,7 @@ State 115 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2698,7 +2698,7 @@ State 116 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2752,7 +2752,7 @@ State 117 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2806,7 +2806,7 @@ State 118 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2860,7 +2860,7 @@ State 119 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2914,7 +2914,7 @@ State 120 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -2968,7 +2968,7 @@ State 121 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3027,7 +3027,7 @@ State 122 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3118,7 +3118,7 @@ State 127 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3355,7 +3355,7 @@ State 141 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3409,7 +3409,7 @@ State 142 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3463,7 +3463,7 @@ State 143 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3517,7 +3517,7 @@ State 144 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3571,7 +3571,7 @@ State 145 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3696,7 +3696,7 @@ State 151 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -3750,7 +3750,7 @@ State 152 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -4546,7 +4546,7 @@ State 183 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -4600,7 +4600,7 @@ State 184 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -4654,7 +4654,7 @@ State 185 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 TwoOrMoreArguments go to state 129 @@ -5243,7 +5243,7 @@ State 212 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -5312,7 +5312,7 @@ State 215 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -5742,7 +5742,7 @@ State 237 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -5797,7 +5797,7 @@ State 238 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6095,7 +6095,7 @@ State 260 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6149,7 +6149,7 @@ State 261 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6203,7 +6203,7 @@ State 262 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6257,7 +6257,7 @@ State 263 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6311,7 +6311,7 @@ State 264 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6494,7 +6494,7 @@ State 274 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -6911,7 +6911,7 @@ State 295 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -7396,7 +7396,7 @@ State 317 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -7451,7 +7451,7 @@ State 318 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -7505,7 +7505,7 @@ State 319 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -7873,7 +7873,7 @@ State 337 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -7927,7 +7927,7 @@ State 338 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -8082,7 +8082,7 @@ State 344 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -8249,7 +8249,7 @@ State 351 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 Identifier go to state 70 @@ -8391,7 +8391,7 @@ State 354 IntegerLiteral go to state 64 RationalLiteral go to state 65 DecimalLiteral go to state 66 - BitLiteral go to state 67 + BinaryLiteral go to state 67 StringLiteral go to state 68 ReferenceLiteral go to state 69 TwoOrMoreArguments go to state 129 diff --git a/src/various/GrammarParser.tab.h b/src/various/GrammarParser.tab.h index 7f1195caf..ccb774f7a 100644 --- a/src/various/GrammarParser.tab.h +++ b/src/various/GrammarParser.tab.h @@ -463,7 +463,7 @@ namespace libcasm_fe // IntegerLiteral // RationalLiteral // DecimalLiteral - // BitLiteral + // BinaryLiteral // StringLiteral char dummy54[ sizeof( ValueAtom::Ptr ) ]; @@ -1546,7 +1546,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral value.copy< ValueAtom::Ptr >( other.value ); break; @@ -1816,7 +1816,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral value.copy< ValueAtom::Ptr >( v ); break; @@ -2627,7 +2627,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral value.template destroy< ValueAtom::Ptr >(); break; @@ -2901,7 +2901,7 @@ namespace libcasm_fe case 126: // IntegerLiteral case 127: // RationalLiteral case 128: // DecimalLiteral - case 129: // BitLiteral + case 129: // BinaryLiteral case 130: // StringLiteral value.move< ValueAtom::Ptr >( s.value ); break; diff --git a/src/various/GrammarParser.xml b/src/various/GrammarParser.xml index ef280f036..27bc54462 100644 --- a/src/various/GrammarParser.xml +++ b/src/various/GrammarParser.xml @@ -934,7 +934,7 @@ Literal - BitLiteral + BinaryLiteral @@ -986,13 +986,13 @@ - BitLiteral + BinaryLiteral "binary" - BitLiteral + BinaryLiteral "hexadecimal" @@ -1515,7 +1515,7 @@ - + @@ -1824,7 +1824,7 @@ - + @@ -2399,7 +2399,7 @@ - + @@ -2599,7 +2599,7 @@ - + @@ -2730,7 +2730,7 @@ - + @@ -2861,7 +2861,7 @@ - + @@ -2996,7 +2996,7 @@ - + @@ -3135,7 +3135,7 @@ - + @@ -3991,7 +3991,7 @@ - + @@ -4832,7 +4832,7 @@ - + @@ -5181,7 +5181,7 @@ - + @@ -5312,7 +5312,7 @@ - + @@ -5443,7 +5443,7 @@ - + @@ -5574,7 +5574,7 @@ - + @@ -5705,7 +5705,7 @@ - + @@ -5836,7 +5836,7 @@ - + @@ -5967,7 +5967,7 @@ - + @@ -6098,7 +6098,7 @@ - + @@ -6229,7 +6229,7 @@ - + @@ -6360,7 +6360,7 @@ - + @@ -6491,7 +6491,7 @@ - + @@ -6622,7 +6622,7 @@ - + @@ -6753,7 +6753,7 @@ - + @@ -6884,7 +6884,7 @@ - + @@ -7015,7 +7015,7 @@ - + @@ -7146,7 +7146,7 @@ - + @@ -7277,7 +7277,7 @@ - + @@ -7415,7 +7415,7 @@ - + @@ -7614,7 +7614,7 @@ - + @@ -8079,7 +8079,7 @@ - + @@ -8210,7 +8210,7 @@ - + @@ -8341,7 +8341,7 @@ - + @@ -8472,7 +8472,7 @@ - + @@ -8603,7 +8603,7 @@ - + @@ -8840,7 +8840,7 @@ - + @@ -8971,7 +8971,7 @@ - + @@ -11648,7 +11648,7 @@ - + @@ -11779,7 +11779,7 @@ - + @@ -11914,7 +11914,7 @@ - + @@ -12882,7 +12882,7 @@ - + @@ -13042,7 +13042,7 @@ - + @@ -13873,7 +13873,7 @@ - + @@ -14005,7 +14005,7 @@ - + @@ -14689,7 +14689,7 @@ - + @@ -14820,7 +14820,7 @@ - + @@ -14951,7 +14951,7 @@ - + @@ -15082,7 +15082,7 @@ - + @@ -15213,7 +15213,7 @@ - + @@ -15648,7 +15648,7 @@ - + @@ -16454,7 +16454,7 @@ - + @@ -17646,7 +17646,7 @@ - + @@ -17778,7 +17778,7 @@ - + @@ -17909,7 +17909,7 @@ - + @@ -18630,7 +18630,7 @@ - + @@ -18761,7 +18761,7 @@ - + @@ -19112,7 +19112,7 @@ - + @@ -19485,7 +19485,7 @@ - + @@ -19728,7 +19728,7 @@ - +