From 31020cca8a0df57abf42ff317381977546b5c68c Mon Sep 17 00:00:00 2001 From: is Date: Mon, 17 Oct 2005 20:18:34 +0000 Subject: String-Pointer conversion patches from NetBSD sr package --- lang/mpd/Makefile | 4 ++-- lang/mpd/distinfo | 7 ++++++- lang/mpd/patches/patch-bd | 13 +++++++++++++ lang/mpd/patches/patch-be | 38 ++++++++++++++++++++++++++++++++++++++ lang/mpd/patches/patch-bf | 9 +++++++++ lang/mpd/patches/patch-bg | 39 +++++++++++++++++++++++++++++++++++++++ lang/mpd/patches/patch-bh | 9 +++++++++ 7 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 lang/mpd/patches/patch-bd create mode 100644 lang/mpd/patches/patch-be create mode 100644 lang/mpd/patches/patch-bf create mode 100644 lang/mpd/patches/patch-bg create mode 100644 lang/mpd/patches/patch-bh (limited to 'lang') diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index 60628543902..c5cc331f47d 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2005/10/17 19:45:18 is Exp $ +# $NetBSD: Makefile,v 1.3 2005/10/17 20:18:34 is Exp $ # PKGNAME= mpd-1.0.1 DISTNAME= mpd.1.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang parallel MASTER_SITES= http://www.cs.arizona.edu/mpd/download/ EXTRACT_SUFX= .tgz diff --git a/lang/mpd/distinfo b/lang/mpd/distinfo index 227fe773628..9c254cddff8 100644 --- a/lang/mpd/distinfo +++ b/lang/mpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/10/17 19:45:18 is Exp $ +$NetBSD: distinfo,v 1.3 2005/10/17 20:18:34 is Exp $ SHA1 (mpd.1.0.1.tgz) = 797b505935ccc741fdca6010bc0bd53601a6f262 RMD160 (mpd.1.0.1.tgz) = 2862ae9220ec0a546ed4193aeee4dc8dc94610a2 @@ -17,5 +17,10 @@ SHA1 (patch-az) = 1560c8ea0b760e2fb97385e565d87a49a879c6a2 SHA1 (patch-ba) = 21de20ed7f9e064a988cf091253ae7a5ad962487 SHA1 (patch-bb) = 6214584bde5a05386d0f31690b30a9c0a8c299af SHA1 (patch-bc) = be4f8c47486c5b6933494f4e92fd8c340425a167 +SHA1 (patch-bd) = 62556e84f29c32310d27cb105cc6de5b4fd5e817 +SHA1 (patch-be) = 85689a95f9311e3e70c0b4a532d57dae6b931b35 +SHA1 (patch-bf) = 20e66a54a51702ce229ef53e250c467d01e2d3b2 +SHA1 (patch-bg) = 231723cbc6b6baef132aefd450524942fb0108f2 +SHA1 (patch-bh) = c880064e871297a411e2292f78d82222bb46dac4 SHA1 (patch-bi) = 31fc9eb664dd3e73c7fe12ae6e95fd85b67286fc SHA1 (patch-bk) = ffbcc49346ea57a3fd0eed51d7bb00f80e25f3a5 diff --git a/lang/mpd/patches/patch-bd b/lang/mpd/patches/patch-bd new file mode 100644 index 00000000000..b39cbf50627 --- /dev/null +++ b/lang/mpd/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1 2005/10/17 20:18:34 is Exp $ + +--- vsuite/quick/ptrstr/No_input.std.orig 2005-03-11 09:46:24.000000000 +0100 ++++ vsuite/quick/ptrstr/No_input.std +@@ -0,0 +1,8 @@ ++Testing pointer-string-pointer conversions: ++Null pointer: ==null== ; string: ==null== ; int: 0 ; pt(==null==): ==null== ++pointer identity: true ++string identity: true ++pointerX identity: true ++Expect invalid conversion: ++RTS abort: file pointer.mpd, line 31: ++ illegal conversion: pointer("invalid") diff --git a/lang/mpd/patches/patch-be b/lang/mpd/patches/patch-be new file mode 100644 index 00000000000..f2bd04518be --- /dev/null +++ b/lang/mpd/patches/patch-be @@ -0,0 +1,38 @@ +$NetBSD: patch-be,v 1.1 2005/10/17 20:18:34 is Exp $ + +--- vsuite/quick/ptrstr/pointer.mpd.orig 2005-10-17 22:06:31.000000000 +0200 ++++ vsuite/quick/ptrstr/pointer.mpd +@@ -0,0 +1,33 @@ ++resource pointer() ++ type pt = ptr int ++ pt foo ++ pt bar ++ pt baz ++ pt nul ++ string[20] foos ++ string[20] bars ++ ++ write("Testing pointer-string-pointer conversions:") ++ ++ nul = null ++ write("Null pointer:", nul, "; string:", string(nul), ++ "; int:", int(nul), "; pt(==null==):", pt("==null==")) ++ ++ baz = new(int) ++ ++ foo = new(int) ++ foos= string(foo) ++ ++ bar = pt(foos) ++ bars= string(bar) ++ ++ baz = pt(foos||"X") ++ ++ write("pointer identity:", foo == bar) ++ write("string identity:", foos == bars) ++ write("pointerX identity:", foo == baz) ++ ++ write("Expect invalid conversion:") ++ baz = pt("invalid") ++ ++end diff --git a/lang/mpd/patches/patch-bf b/lang/mpd/patches/patch-bf new file mode 100644 index 00000000000..c33b4c70514 --- /dev/null +++ b/lang/mpd/patches/patch-bf @@ -0,0 +1,9 @@ +$NetBSD: patch-bf,v 1.1 2005/10/17 20:18:34 is Exp $ + +--- vsuite/quick/ptrstr/Script.orig 2005-03-11 09:46:25.000000000 +0100 ++++ vsuite/quick/ptrstr/Script +@@ -0,0 +1,4 @@ ++# ignatios Fri Mar 11 10:07:24 CET 2005 ++0 mpd pointer.mpd ++1 run ++0 rm -rf Interfaces core *.out diff --git a/lang/mpd/patches/patch-bg b/lang/mpd/patches/patch-bg new file mode 100644 index 00000000000..5f34284d552 --- /dev/null +++ b/lang/mpd/patches/patch-bg @@ -0,0 +1,39 @@ +$NetBSD: patch-bg,v 1.1 2005/10/17 20:18:34 is Exp $ + +--- rts/conv.c.orig 1999-07-28 22:42:24.000000000 +0200 ++++ rts/conv.c +@@ -219,11 +219,30 @@ mpd_ptrval (locn, s) + char *locn; + String *s; + { ++ unsigned long ul; ++ char c[2], d[2]; ++ int t; ++ + mpd_check_stk (CUR_STACK); +- if (s->length == 8 && strncmp (DATA (s), "==null==", 8) == 0) +- return 0; +- else +- return (Ptr) mpd_intval (locn, s); ++ ++ if (s->length == 8 && strncmp (DATA (s), "==null==", 8) == 0) { ++ return (Ptr)0; ++ } ++ /* implicit else */ ++ ++ c[0] = '\0'; ++ DATA (s) [s->length] = '\0'; ++ ++ t = sscanf (DATA (s), "%lx%1s%1s", &ul, c, d); ++ ++ if ( t != 1 && ++ (t != 2 || (c[0] != 'x' && c[0] != 'X'))) { ++ ++ mpd_runerr (locn, E_PCNV, s); ++ } ++ ++ return (Ptr) ul; ++ + } + + diff --git a/lang/mpd/patches/patch-bh b/lang/mpd/patches/patch-bh new file mode 100644 index 00000000000..593e5d3feb9 --- /dev/null +++ b/lang/mpd/patches/patch-bh @@ -0,0 +1,9 @@ +$NetBSD: patch-bh,v 1.1 2005/10/17 20:18:34 is Exp $ + +--- runerr.h.orig 2005-03-11 09:28:59.000000000 +0100 ++++ runerr.h +@@ -40,3 +40,4 @@ RUNERR(E_CCNV,41,"illegal conversion: ch + RUNERR(E_BCNV,42,"illegal conversion: bool(\"%S\")") + RUNERR(E_ICNV,43,"illegal conversion: int(\"%S\")") + RUNERR(E_RCNV,44,"illegal conversion: real(\"%S\")") ++RUNERR(E_PCNV,45,"illegal conversion: pointer(\"%S\")") -- cgit v1.2.3