Use existing irep_idts instead of strings

tautschnig · tautschnig · commit b2e4ca02045a · 2018-04-25T15:04:49.000+01:00
diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/src/cpp/cpp_typecheck_resolve.cpp
@@ -839,11 +839,11 @@ exprt cpp_typecheck_resolvet::do_builtin(
                             << ": " << original_scope->prefix
                             << messaget::eom;
   }
-  else if(base_name=="size_t")
+  else if(base_name == ID_size_t)
   {
     dest=type_exprt(size_type());
   }
-  else if(base_name=="ssize_t")
+  else if(base_name == ID_ssize_t)
   {
     dest=type_exprt(signed_size_type());
   }
diff --git a/src/goto-programs/remove_asm.cpp b/src/goto-programs/remove_asm.cpp
@@ -195,7 +195,7 @@ void remove_asmt::process_instruction(
       {
         gcc_asm_function_call("__asm_"+id2string(command), code, tmp_dest);
       }
-      else if(command=="sync") // Power
+      else if(command == ID_sync) // Power
       {
         goto_programt::targett t=tmp_dest.add_instruction(OTHER);
         t->source_location=code.source_location();
@@ -210,7 +210,7 @@ void remove_asmt::process_instruction(
         t->code.set(ID_RRcumul, true);
         t->code.set(ID_WRcumul, true);
       }
-      else if(command=="lwsync") // Power
+      else if(command == ID_lwsync) // Power
       {
         goto_programt::targett t=tmp_dest.add_instruction(OTHER);
         t->source_location=code.source_location();
@@ -223,7 +223,7 @@ void remove_asmt::process_instruction(
         t->code.set(ID_RWcumul, true);
         t->code.set(ID_RRcumul, true);
       }
-      else if(command=="isync") // Power
+      else if(command == ID_isync) // Power
       {
         goto_programt::targett t=tmp_dest.add_instruction(OTHER);
         t->source_location=code.source_location();
diff --git a/src/goto-symex/slice_by_trace.cpp b/src/goto-symex/slice_by_trace.cpp
@@ -244,7 +244,7 @@ void symex_slice_by_tracet::compute_ts_back(
        !i->io_args.empty() &&
        i->io_args.front().id()=="trace_event")
     {
-      irep_idt event=i->io_args.front().get("event");
+      irep_idt event = i->io_args.front().get(ID_event);
 
       if(!alphabet.empty())
       {
diff --git a/src/solvers/smt2/smt2_parser.cpp b/src/solvers/smt2/smt2_parser.cpp
@@ -774,7 +774,7 @@ exprt smt2_parsert::function_application()
         }
         else if(id=="rotate_left" ||
                 id=="rotate_right" ||
-                id=="repeat" ||
+                id == ID_repeat ||
                 id=="sign_extend" ||
                 id=="zero_extend")
         {
@@ -826,7 +826,7 @@ exprt smt2_parsert::function_application()
 
             return typecast_exprt(op[0], unsigned_type);
           }
-          else if(id=="repeat")
+          else if(id == ID_repeat)
           {
             return nil_exprt();
           }

Original file line number	Diff line number	Diff line change
`@@ -839,11 +839,11 @@ exprt cpp_typecheck_resolvet::do_builtin(`
`839`	`839`	`<< ": " << original_scope->prefix`
`840`	`840`	`<< messaget::eom;`
`841`	`841`	`}`
`842`		`- else if(base_name=="size_t")`
	`842`	`+ else if(base_name == ID_size_t)`
`843`	`843`	`{`
`844`	`844`	`dest=type_exprt(size_type());`
`845`	`845`	`}`
`846`		`- else if(base_name=="ssize_t")`
	`846`	`+ else if(base_name == ID_ssize_t)`
`847`	`847`	`{`
`848`	`848`	`dest=type_exprt(signed_size_type());`
`849`	`849`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ void remove_asmt::process_instruction(`
`195`	`195`	`{`
`196`	`196`	`gcc_asm_function_call("__asm_"+id2string(command), code, tmp_dest);`
`197`	`197`	`}`
`198`		`- else if(command=="sync") // Power`
	`198`	`+ else if(command == ID_sync) // Power`
`199`	`199`	`{`
`200`	`200`	`goto_programt::targett t=tmp_dest.add_instruction(OTHER);`
`201`	`201`	`t->source_location=code.source_location();`
`@@ -210,7 +210,7 @@ void remove_asmt::process_instruction(`
`210`	`210`	`t->code.set(ID_RRcumul, true);`
`211`	`211`	`t->code.set(ID_WRcumul, true);`
`212`	`212`	`}`
`213`		`- else if(command=="lwsync") // Power`
	`213`	`+ else if(command == ID_lwsync) // Power`
`214`	`214`	`{`
`215`	`215`	`goto_programt::targett t=tmp_dest.add_instruction(OTHER);`
`216`	`216`	`t->source_location=code.source_location();`
`@@ -223,7 +223,7 @@ void remove_asmt::process_instruction(`
`223`	`223`	`t->code.set(ID_RWcumul, true);`
`224`	`224`	`t->code.set(ID_RRcumul, true);`
`225`	`225`	`}`
`226`		`- else if(command=="isync") // Power`
	`226`	`+ else if(command == ID_isync) // Power`
`227`	`227`	`{`
`228`	`228`	`goto_programt::targett t=tmp_dest.add_instruction(OTHER);`
`229`	`229`	`t->source_location=code.source_location();`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ void symex_slice_by_tracet::compute_ts_back(`
`244`	`244`	`!i->io_args.empty() &&`
`245`	`245`	`i->io_args.front().id()=="trace_event")`
`246`	`246`	`{`
`247`		`- irep_idt event=i->io_args.front().get("event");`
	`247`	`+ irep_idt event = i->io_args.front().get(ID_event);`
`248`	`248`
`249`	`249`	`if(!alphabet.empty())`
`250`	`250`	`{`
Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ exprt smt2_parsert::function_application()`
`774`	`774`	`}`
`775`	`775`	`else if(id=="rotate_left" \|\|`
`776`	`776`	`id=="rotate_right" \|\|`
`777`		`- id=="repeat" \|\|`
	`777`	`+ id == ID_repeat \|\|`
`778`	`778`	`id=="sign_extend" \|\|`
`779`	`779`	`id=="zero_extend")`
`780`	`780`	`{`
`@@ -826,7 +826,7 @@ exprt smt2_parsert::function_application()`
`826`	`826`
`827`	`827`	`return typecast_exprt(op[0], unsigned_type);`
`828`	`828`	`}`
`829`		`- else if(id=="repeat")`
	`829`	`+ else if(id == ID_repeat)`
`830`	`830`	`{`
`831`	`831`	`return nil_exprt();`
`832`	`832`	`}`