ruby-list

えぐち＠エスアンドイー です。

>>> In message [ruby-list:16314] Re: printf の $ について
    On Wed, 25 Aug 1999 20:51:27 +0900, EGUCHI Osamu <eguchi@shizuokanet.ne.jp> said:

eguchi> えぐち＠エスアンドイー です。
eguchi> 
eguchi> >>> In message [ruby-list:16313] Re: printf の $ について
eguchi>     On Wed, 25 Aug 1999 15:54:56 +0900, matz@netlab.co.jp (Yukihiro Matsumoto) said:
eguchi> 
eguchi> matz> まつもと ゆきひろです
eguchi> ...
eguchi> matz> sprintf.cのGETARG()マクロとかを書き換えればできるのかなあ。
eguchi> matz> しかし、当面私自身が手を付ける気は無いですね。
eguchi> matz> 誰かやる？
eguchi> 
eguchi> やっつけてみました。

参照順位の数え上げが間違えていました。
これでいいはず、、

	えぐち

Attachments (1)

sprintf2.diff (3.1 KB, text/x-diff)

Index: sprintf.c
===================================================================
RCS file: /usr/home/eguchi/cvs.netlab.co.jp//ruby/sprintf.c,v
retrieving revision 1.2
diff -d -u -r1.2 sprintf.c
--- sprintf.c	1999/08/13 05:45:14	1.2
+++ sprintf.c	1999/08/25 12:39:28
@@ -135,8 +135,9 @@
     blen += (l);\
 }
 
-#define GETARG() \
-    ((argc == 0)?(rb_raise(rb_eArgError, "too few argument."),0):(argc--,((argv++)[0])))
+#define GETARG(index) \
+    ((index<0||index>=argc)?(rb_raise(rb_eArgError, "too few argument."),0)\
+    :argv[index])
 
 VALUE
 rb_f_sprintf(argc, argv)
@@ -148,11 +149,12 @@
     int blen, bsiz;
     VALUE result;
 
-    int width, prec, flags = FNONE;
+    int width, prec, flags = FNONE, index = 0;
     VALUE tmp;
     VALUE str;
 
-    fmt = GETARG();
+    fmt = GETARG(index); 
+    index++;
     p = str2cstr(fmt, &blen);
     end = p + blen;
     blen = 0;
@@ -161,6 +163,7 @@
 
     for (; p < end; p++) {
 	char *t;
+	int i;
 
 	for (t = p; t < end && *t != '%'; t++) ;
 	CHECK(t - p);
@@ -172,6 +175,8 @@
 	p = t + 1;		/* skip `%' */
 
 	width = prec = -1;
+      incl:
+	i = index++;
       retry:
 	switch (*p) {
 	  default:
@@ -208,6 +213,12 @@
 
 	  case '1': case '2': case '3': case '4':
 	  case '5': case '6': case '7': case '8': case '9':
+	    if (p[1] == '$') {
+		i = *p - '0';
+		p = &p[2];
+		index++;
+		goto retry;
+	    }
 	    flags |= FWIDTH;
 	    width = 0;
 	    for (; p < end && ISDIGIT(*p); p++) {
@@ -224,14 +235,23 @@
 	    }
 
 	    flags |= FWIDTH;
-	    tmp = GETARG();
+	    switch (p[1]) {
+	      case '1': case '2': case '3': case '4':
+	      case '5': case '6': case '7': case '8': case '9':
+		  if (p[2] == '$') {
+		      i = p[1] - '0';
+		      p = &p[2];
+		  }
+		  break;
+	    }
+	    tmp = GETARG(i);
 	    width = NUM2INT(tmp);
 	    if (width < 0) {
 		flags |= FMINUS;
 		width = -width;
 	    }
 	    p++;
-	    goto retry;
+	    goto incl;
 
 	  case '.':
 	    if (flags & FPREC) {
@@ -241,12 +261,21 @@
 	    prec = 0;
 	    p++;
 	    if (*p == '*') {
-		tmp = GETARG();
+		switch (p[1]) {
+		  case '1': case '2': case '3': case '4':
+		  case '5': case '6': case '7': case '8': case '9':
+		      if (p[2] == '$') {
+			  i = p[1] - '0';
+			  p = &p[2];
+		      }
+		      break;
+		}
+		tmp = GETARG(i);
 		prec = NUM2INT(tmp);
 		if (prec > 0)
 		    flags |= FPREC;
 		p++;
-		goto retry;
+		goto incl;
 	    }
 
 	    for (; p < end && ISDIGIT(*p); p++) {
@@ -264,11 +293,12 @@
 	  case '\0':
 	  case '%':
 	    PUSH("%", 1);
+	    index--;
 	    break;
 
 	  case 'c':
 	    {
-		VALUE val = GETARG();
+		VALUE val = GETARG(i);
 		char c;
 
 		if (!(flags & FMINUS))
@@ -283,7 +313,7 @@
 
 	  case 's':
 	    {
-		VALUE arg = GETARG();
+		VALUE arg = GETARG(i);
 		int len;
 
 		str = rb_obj_as_string(arg);
@@ -329,7 +359,7 @@
 	  case 'b':
 	  case 'u':
 	    {
-		volatile VALUE val = GETARG();
+		volatile VALUE val = GETARG(i);
 		char fbuf[32], nbuf[64], *s, *t;
 		char *prefix = 0;
 		int sign = 0;
@@ -563,7 +593,7 @@
 	  case 'e':
 	  case 'E':
 	    {
-		VALUE val = GETARG();
+		VALUE val = GETARG(i);
 		double fval;
 		int i, need = 6;
 		char fbuf[32];

Thread

Prev Next

In This Thread

Prev Next

[#15820] maillib with big base64 — kikutani@...

[#15825] matrix.o — Takashi Nishimoto <g96p0935@...>

[#15828] Ruby/Gtk for cygwin インストールについて — otokita@...

[#15832] Array#reverse! — setsura <setsura@...>

[#15833] ruby-orbit-0.0.1 — Dai <MAP2303@...>

[#15839] Windows95 で Tk — H サイトウ <HiroshiSaito@...>

[#15840] FreeBSD port kit for Ruby 1.3.6 — Yasuhiro Fukuma <yasuf@...>

[#15844] Re: alias new open — 助田 雅紀 <masaki.suketa@...>

[#15848] — Kazumi Okamoto <okamoto@...>

[#15856] Tiny Tiny eruby — Masatoshi SEKI <m_seki@...>

[#15865] mime.rb rev 1.4 — "NAKAMURA, Hiroshi" <nakahiro@...>

[#15870] help — Hideo Koyama <fa8h-kym@...>

[#15873] UDPsocket#recvfrom の API 変更について — Toshihiko SHIMOKAWA / 下川俊彦 <toshi@...>

[#15874] postgres でのユーザ指定 — Norio Kasahara <kasa@...>

[#15882] はじめまして — OGINO AKIHIRO <akimaru@...>

[#15885] difference of \Z between perl and ruby — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#15890] difference of system() between UNIX and Windows — suzuki@...

[#15894] RE: difference of system() between UNIX and Win dows — 助田 雅紀 <masaki.suketa@...>

[#15899] ruby/tk on cygwin /w Tk8.1 — たむら けんいち <tamura-r@...>

[#15902] sybase module — Hisakuni FUJIMOTO <hisa@...>

[#15911] Re: [ruby-talk:00563] Date class and rfc822 — Wakou Aoyama <wakou@...>

[#15912] [][-n,n] — Wakou Aoyama <wakou@...>

[#15916] Re: [][-n,n] — Inaba Hiroto <inaba@...>

[#15920] Re: [][-n,n] — Inaba Hiroto <inaba@...>

[#15927] Ruby 1.3.7 — Yukihiro Matsumoto <matz@...>

[#15928] DAO クラスモジュール 0.001alpha — たむら けんいち <tamura-r@...>

[#15935] Ruby/IRC — Shugo Maeda <shugo@...>

[#15944] Ruby 1.3.7 — Yukihiro Matsumoto <matz@...>

[#15954] [^] — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#15955] echo しない readline — m_seki@...

[#15956] FAQ-990807 — Akira Endo <akendo@...3.rim.or.jp>

[#15965] String#split — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#15966] あしたのために(その一) — kikutani@...

[#15981] Ruby/Tk81 Demos — ttate@...

[#15993] Where is "ruby-mode.sl" ?? — Ryuichi Tamura <tam@...3.kais.kyoto-u.ac.jp>

[#15996] Sun World — matz@... (Yukihiro Matsumoto)

[#16002] how to know binary file — kikutani@...

[#16003] RE: Sun World — 助田 雅紀 <masaki.suketa@...>

[#16004] RE: how to know binary file — 助田 雅紀 <masaki.suketa@...>

[#16023] Ruby/PDFlib — thitoshi@... (TAKAHASHI Hitoshi)

[#16025] eRuby 0.0.4 — Shugo Maeda <shugo@...>

[#16027] 日経オープンシステム — Ataru NAKATA <anakata@...>

[#16028] C マガ — hisanori@...

[#16034] mod_ruby 0.1.4 — Shugo Maeda <shugo@...>

[#16036] ruby/gtk でウィンドウを中央に表示したい — kkubota@18software.co.jp

[#16042] JUS Ruby Workshop — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#16048] ruby/tk の menu_spec について — S-Harada<jdn@...>

[#16049] [].length==0 — Kazuhiro HIWADA <hiwada@...>

[#16052] Re: ruby/gtk でウィンドウを中央に表示したい — kkubota@18software.co.jp

[#16055] Re: ruby/gtk でウィンドウを中央に表示したい — kkubota@18software.co.jp

[#16058] Re: ruby/gtk でウィンドウを中央に表示したい — Miyaki Masahiro <miyaki@...>

[#16059] Re: ruby/gtk でウィンドウを中央に表示したい — kkubota@18software.co.jp

[#16061] calendar/date — Tadayoshi Funaba <tadf@...>

[#16085] Re: ruby/gtk でウィンドウを中央に表示したい — kkubota@18software.co.jp

[#16091] The last day of a month — Akihiro Yamauchi <aygoofy@...>

[#16095] rd2html — Toshiro Kuwabara <toshirok@...3.so-net.ne.jp>

[#16099] クラスの別名 — Takashi Nishimoto <g96p0935@...>

[#16102] mysql-ruby link on RAA — とみたまさひろ <tommy@...>

[#16118] Ruby 1.4.0 — matz@... (Yukihiro Matsumoto)

[#16126] English document for RDtool — Toshiro Kuwabara <toshirok@...3.so-net.ne.jp>

[#16127] readline with 1.4 — kikutani@...

[#16147] Q: Constants — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#16151] extinit & mkmain — Takashi Nishimoto <g96p0935@...>

[#16152] mkprototype — Takashi Nishimoto <g96p0935@...>

[#16153] ANN: testsupp 0.2 released. — gotoken@... (GOTO Kentaro)

[#16157] rdtool-0.2.1 — Toshiro Kuwabara <toshirok@...3.so-net.ne.jp>

[#16158] maillib? 0.5.0 — Minero Aoki <aamine@...>

[#16164] Re: Ruby 1.4.0 — SHIROYAMA Takayuki <psi@...>

[#16167] Ruby 1.4.0 on BSD/OS 3.1 — OHARA Shigeki <os@...>

[#16171] FAQ の間違い ? — hiramatsu@...

[#16177] Ruby 1.4.0 binaries for cygwin, djgpp — WATANABE Hirofumi <watanabe@...>

[#16179] parsearg with debug.rb — kikutani@...

[#16185] Ruby lecture in Sapporo — gotoken@... (GOTO Kentaro)

[#16199] ruby/gtk の focus_out_event について — kkubota@18software.co.jp

[#16201] Re: ruby/gtk の focus_out_event について — kkubota@18software.co.jp

[#16202] — Hiroyuki Ueki <ueki@...>

[#16209] year of parsedate — kikutani@...

[#16216] timeout.rb — wakou@...

[#16218] ruby-1.4.0 [BUG] Segmentation fault — Toshihiko SHIMOKAWA / 下川俊彦 <toshi@...>

[#16219] Re: year of parsedate — Inaba Hiroto <inaba@...>

[#15844] Re: alias new open — 助田　雅紀 <masaki.suketa@...>

[#15894] RE: difference of system() between UNIX and Win dows — 助田　雅紀 <masaki.suketa@...>

[#15899] ruby/tk on cygwin /w Tk8.1 — たむら　けんいち <tamura-r@...>

[#15928] DAO クラスモジュール 0.001alpha — たむら　けんいち <tamura-r@...>

[#16003] RE: Sun World — 助田　雅紀 <masaki.suketa@...>

[#16004] RE: how to know binary file — 助田　雅紀 <masaki.suketa@...>

[#16228] Setup.nt — 助田　雅紀 <masaki.suketa@...>

[#16264] RE: ruby hacking guide — 助田　雅紀 <masaki.suketa@...>

[#16274] Re: Setup.nt — 助田　雅紀 <masaki.suketa@...>

[#16287] RE: Japanese in ruby/gtk (cygwin) — 助田　雅紀 <masaki.suketa@...>