[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-user: SCM_ASSERT() with false SCM_ARGx
This is a multipart MIME message.
--==_Exmh_1311673358_24260
From guile documentation:
-- Macro: void SCM_ASSERT (int TEST, SCM OBJ, unsigned int POSITION,
const char *SUBR)
...
-- Macro: int SCM_ARG1
...
-- Macro: int SCM_ARG7
One of the above values can be used for POSITION to indicate the
number of the argument of SUBR which is being checked.
...
Some SCM_ASSERT() calls have the wrong SCM_ARGx for its TEST and OBJ.
Regards,
/Karl Hammar
-----------------------------------------------------------------------
Aspö Data
Lilla Aspö 148
S-742 94 Östhammar
Sweden
+46 173 140 57
--==_Exmh_1311673358_24260
Content-Type: text/x-diff ; name="SCM_ARG.diff"
Content-Description: SCM_ARG.diff
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="SCM_ARG.diff"
diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index 67f298a..cf6d510 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -818,11 +818,11 @@ SCM g_graphical_objs_in_net_with_attrib_get_attrib =
(SCM scm_netname, SCM scm_has
"gnetlist:get-attr-of-conn-graph-objs-with-attr");
=
SCM_ASSERT(scm_is_string (scm_wanted_attribute),
- scm_wanted_attribute, SCM_ARG2, =
+ scm_wanted_attribute, SCM_ARG3, =
"gnetlist:get-attr-of-conn-graph-objs-with-attr");
=
SCM_ASSERT(scm_is_string (scm_has_attribute),
- scm_has_attribute, SCM_ARG3, =
+ scm_has_attribute, SCM_ARG2, =
"gnetlist:get-attr-of-conn-graph-objs-with-attr");
=
scm_dynwind_begin (0);
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index a4cf5e6..1e3a0c4 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -214,7 +214,7 @@ SCM g_funcs_filesel(SCM scm_msg, SCM scm_templ, SCM s=
cm_flags)
SCM_ARG1, "gschem-filesel");
=
SCM_ASSERT (scm_is_string (scm_templ), scm_templ,
- SCM_ARG1, "gschem-filesel");
+ SCM_ARG2, "gschem-filesel");
=
/*! \bug FIXME -- figure out the magic SCM_ASSERT for the flags */
=
@@ -243,7 +243,7 @@ SCM g_funcs_filesel(SCM scm_msg, SCM scm_templ, SCM s=
cm_flags)
=
} else {
free(flag);
- scm_wrong_type_arg ("gschem-filesel", SCM_ARG1, scm_flag);
+ scm_wrong_type_arg ("gschem-filesel", SCM_ARG3, scm_flag);
}
free(flag);
}
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index 65c3778..da6420f 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -523,7 +523,7 @@ SCM g_rc_component_library_funcs (SCM listfunc, SCM g=
etfunc, SCM name)
"component-library-funcs");
SCM_ASSERT (scm_is_true (scm_procedure_p (getfunc)), getfunc, SCM_ARG2=
,
"component-library-funcs");
- SCM_ASSERT (scm_is_string (name), name, SCM_ARG1, =
+ SCM_ASSERT (scm_is_string (name), name, SCM_ARG3, =
"component-library-funcs");
=
namestr =3D scm_to_utf8_string (name);
diff --git a/libgeda/src/scheme_attrib.c b/libgeda/src/scheme_attrib.c
index 1c5f0f4..752b2a4 100644
--- a/libgeda/src/scheme_attrib.c
+++ b/libgeda/src/scheme_attrib.c
@@ -259,7 +259,7 @@ SCM_DEFINE (promotable_attribs, "%promotable-attribs"=
, 1, 0, 0,
(SCM complex_s), "Get a component's promotable attributes")
{
SCM_ASSERT (edascm_is_object_type (complex_s, OBJ_COMPLEX), complex_s,=
- SCM_ARG2, s_promotable_attribs);
+ SCM_ARG1, s_promotable_attribs);
=
TOPLEVEL *toplevel =3D edascm_c_current_toplevel ();
OBJECT *obj =3D edascm_to_object (complex_s);
diff --git a/libgeda/src/scheme_object.c b/libgeda/src/scheme_object.c
index 8a2ef57..1623b37 100644
--- a/libgeda/src/scheme_object.c
+++ b/libgeda/src/scheme_object.c
@@ -1200,11 +1200,11 @@ SCM_DEFINE (set_arc_x, "%set-arc!", 7, 0, 0,
SCM_ASSERT (scm_is_integer (x_s), x_s, SCM_ARG2, s_set_arc_x);=
SCM_ASSERT (scm_is_integer (y_s), y_s, SCM_ARG3, s_set_arc_x);=
SCM_ASSERT (scm_is_integer (r_s), r_s, SCM_ARG4, s_set_arc_x);=
- SCM_ASSERT (scm_is_integer (color_s), color_s, SCM_ARG5, s_set_arc_x);=
+ SCM_ASSERT (scm_is_integer (color_s), color_s, SCM_ARG7, s_set_arc_x);=
SCM_ASSERT (scm_is_integer (start_angle_s),
- start_angle_s, SCM_ARG3, s_set_arc_x);=
+ start_angle_s, SCM_ARG5, s_set_arc_x);=
SCM_ASSERT (scm_is_integer (end_angle_s),
- end_angle_s, SCM_ARG4, s_set_arc_x);
+ end_angle_s, SCM_ARG6, s_set_arc_x);
=
TOPLEVEL *toplevel =3D edascm_c_current_toplevel ();
OBJECT *obj =3D edascm_to_object (arc_s);
--==_Exmh_1311673358_24260--
_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user