Mercurial > projects > ldc

comparison dmd/root.c @ 658:50383e476c7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgraded frontend to DMD 1.035
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Mon, 06 Oct 2008 16:22:11 +0200
parents cbd6c8073a32
children 4ac97ec7c18e
comparison
equal deleted inserted replaced
657:c42173b3557b 658:50383e476c7e
186 printf("%s %p\n", toChars(), this); 186 printf("%s %p\n", toChars(), this);
187 } 187 }
188 188
189 char *Object::toChars() 189 char *Object::toChars()
190 { 190 {
191 return "Object"; 191 return (char *)"Object";
192 } 192 }
193 193
194 dchar *Object::toDchars() 194 dchar *Object::toDchars()
195 { 195 {
196 #if M_UNICODE 196 #if M_UNICODE
310 FileName::FileName(char *str, int ref) 310 FileName::FileName(char *str, int ref)
311 : String(str,ref) 311 : String(str,ref)
312 { 312 {
313 } 313 }
314 314
315 char *FileName::combine(char *path, char *name) 315 char *FileName::combine(const char *path, const char *name)
316 { char *f; 316 { char *f;
317 size_t pathlen; 317 size_t pathlen;
318 size_t namelen; 318 size_t namelen;
319 319
320 if (!path || !*path) 320 if (!path || !*path)
321 return name; 321 return (char *)name;
322 pathlen = strlen(path); 322 pathlen = strlen(path);
323 namelen = strlen(name); 323 namelen = strlen(name);
324 f = (char *)mem.malloc(pathlen + 1 + namelen + 1); 324 f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
325 memcpy(f, path, pathlen); 325 memcpy(f, path, pathlen);
326 326
742 * Search Path for file. 742 * Search Path for file.
743 * Input: 743 * Input:
744 * cwd if !=0, search current directory before searching path 744 * cwd if !=0, search current directory before searching path
745 */ 745 */
746 746
747 char *FileName::searchPath(Array *path, char *name, int cwd) 747 char *FileName::searchPath(Array *path, const char *name, int cwd)
748 { 748 {
749 if (absolute(name)) 749 if (absolute(name))
750 { 750 {
751 return exists(name) ? name : NULL; 751 return exists(name) ? (char *)name : NULL;
752 } 752 }
753 if (cwd) 753 if (cwd)
754 { 754 {
755 if (exists(name)) 755 if (exists(name))
756 return name; 756 return (char *)name;
757 } 757 }
758 if (path) 758 if (path)
759 { unsigned i; 759 { unsigned i;
760 760
761 for (i = 0; i < path->dim; i++) 761 for (i = 0; i < path->dim; i++)
1436 writedchar(*string); 1436 writedchar(*string);
1437 } 1437 }
1438 #endif 1438 #endif
1439 } 1439 }
1440 1440
1441 void OutBuffer::prependstring(char *string) 1441 void OutBuffer::prependstring(const char *string)
1442 { unsigned len; 1442 { unsigned len;
1443 1443
1444 len = strlen(string); 1444 len = strlen(string);
1445 reserve(len); 1445 reserve(len);
1446 memmove(data + len, data, offset); 1446 memmove(data + len, data, offset);
1696 /****************** 1696 /******************
1697 * Insert left at i, and right at j. 1697 * Insert left at i, and right at j.
1698 * Return index just past right. 1698 * Return index just past right.
1699 */ 1699 */
1700 1700
1701 unsigned OutBuffer::bracket(unsigned i, char *left, unsigned j, char *right) 1701 unsigned OutBuffer::bracket(unsigned i, const char *left, unsigned j, const char *right)
1702 { 1702 {
1703 size_t leftlen = strlen(left); 1703 size_t leftlen = strlen(left);
1704 size_t rightlen = strlen(right); 1704 size_t rightlen = strlen(right);
1705 reserve(leftlen + rightlen); 1705 reserve(leftlen + rightlen);
1706 insert(i, left, leftlen); 1706 insert(i, left, leftlen);