comparison src/genprops.awk @ 9584:0fcbfddaa87f

allow abbreviated graphics property names to match, with optional warning
author John W. Eaton <jwe@octave.org>
date Fri, 28 Aug 2009 05:30:29 -0400
parents bdcfb756d721
children 06b8b51dca48
comparison
equal deleted inserted replaced
9583:8dc1531e2149 9584:0fcbfddaa87f
428 ## set method 428 ## set method
429 429
430 if (base) 430 if (base)
431 printf ("void\nbase_properties::set (const caseless_str& pname, const std::string& cname, const octave_value& val)\n{\n") >> filename; 431 printf ("void\nbase_properties::set (const caseless_str& pname, const std::string& cname, const octave_value& val)\n{\n") >> filename;
432 else 432 else
433 printf ("void\n%s::properties::set (const caseless_str& pname, const octave_value& val)\n{\n", 433 printf ("void\n%s::properties::set (const caseless_str& pname_arg, const octave_value& val)\n{\n",
434 class_name) >> filename; 434 class_name) >> filename;
435 435
436 if (! base) 436 if (! base)
437 printf (" const std::set<std::string>& pnames = all_property_names ();\n\n validate_property_name (\"get\", pnames, pname);\n\n if (error_state)\n return;\n\n") >> filename; 437 printf (" const std::set<std::string>& pnames = all_property_names ();\n\n caseless_str pname = validate_property_name (\"get\", pnames, pname_arg);\n\n if (error_state)\n return;\n\n") >> filename;
438 438
439 first = 1; 439 first = 1;
440 440
441 for (i = 1; i <= idx; i++) 441 for (i = 1; i <= idx; i++)
442 { 442 {
481 ## get "one" method 481 ## get "one" method
482 482
483 if (base) 483 if (base)
484 printf ("octave_value\nbase_properties::get (const caseless_str& pname) const\n{\n") >> filename; 484 printf ("octave_value\nbase_properties::get (const caseless_str& pname) const\n{\n") >> filename;
485 else 485 else
486 printf ("octave_value\n%s::properties::get (const caseless_str& pname) const\n{\n", 486 printf ("octave_value\n%s::properties::get (const caseless_str& pname_arg) const\n{\n",
487 class_name) >> filename; 487 class_name) >> filename;
488 printf (" octave_value retval;\n\n") >> filename; 488 printf (" octave_value retval;\n\n") >> filename;
489 489
490 if (! base) 490 if (! base)
491 printf (" const std::set<std::string>& pnames = all_property_names ();\n\n validate_property_name (\"get\", pnames, pname);\n\n if (error_state)\n return retval;\n\n") >> filename; 491 printf (" const std::set<std::string>& pnames = all_property_names ();\n\n caseless_str pname = validate_property_name (\"get\", pnames, pname_arg);\n\n if (error_state)\n return retval;\n\n") >> filename;
492 492
493 for (i = 1; i<= idx; i++) 493 for (i = 1; i<= idx; i++)
494 { 494 {
495 printf (" %sif (pname.compare (\"%s\"))\n", 495 printf (" %sif (pname.compare (\"%s\"))\n",
496 (i > 1 ? "else " : ""), name[i]) >> filename; 496 (i > 1 ? "else " : ""), name[i]) >> filename;
507 ## get_property method 507 ## get_property method
508 508
509 if (base) 509 if (base)
510 printf ("property\nbase_properties::get_property (const caseless_str& pname)\n{\n") >> filename; 510 printf ("property\nbase_properties::get_property (const caseless_str& pname)\n{\n") >> filename;
511 else 511 else
512 printf ("property\n%s::properties::get_property (const caseless_str& pname)\n{\n", 512 printf ("property\n%s::properties::get_property (const caseless_str& pname_arg)\n{\n",
513 class_name) >> filename; 513 class_name) >> filename;
514 514
515 if (! base) 515 if (! base)
516 printf (" const std::set<std::string>& pnames = all_property_names ();\n\n validate_property_name (\"get\", pnames, pname);\n\n if (error_state)\n return property ();\n\n") >> filename; 516 printf (" const std::set<std::string>& pnames = all_property_names ();\n\n caseless_str pname = validate_property_name (\"get\", pnames, pname_arg);\n\n if (error_state)\n return property ();\n\n") >> filename;
517 517
518 for (i = 1; i<= idx; i++) 518 for (i = 1; i<= idx; i++)
519 { 519 {
520 if (ptype[i]) 520 if (ptype[i])
521 { 521 {