Changeset 66f5fc4 in git


Ignore:
Timestamp:
04/03/15 09:48:40 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
40b02e8
Parents:
671c8f6
Message:

src/datain.c,src/readval.c,tests/badinc.out,tests/badinc2.out,
tests/badinc3.out: Include column number when a *include file isn't
found.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r671c8f6 r66f5fc4  
     1Wed Mar 04 09:47:56 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * src/datain.c,src/readval.c,tests/badinc.out,tests/badinc2.out,
     4          tests/badinc3.out: Include column number when a *include file isn't
     5          found.
     6
    17Wed Mar 04 09:22:14 GMT 2015  Olly Betts <olly@survex.com>
    28
  • src/datain.c

    r671c8f6 r66f5fc4  
    399399
    400400      if (fh == NULL) {
    401          compile_error(/*Couldn’t open file “%s”*/24, fnm);
     401         compile_error(-/*Couldn’t open file “%s”*/24, fnm);
    402402         return;
    403403      }
  • src/readval.c

    r671c8f6 r66f5fc4  
    11/* readval.c
    22 * Routines to read a prefix or number from the current input file
    3  * Copyright (C) 1991-2003,2005,2006,2010,2011,2012,2013,2014 Olly Betts
     3 * Copyright (C) 1991-2003,2005,2006,2010,2011,2012,2013,2014,2015 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    481481         nextch();
    482482      }
     483      nextch();
    483484   } else {
    484485      /* Unquoted string */
     
    498499      }
    499500   }
    500 
    501    nextch();
    502501}
    503502
  • tests/badinc.out

    r671c8f6 r66f5fc4  
    1 ./badinc.svx:3: error: Couldn't open file "nonexistent_file"
     1./badinc.svx:3:26: error: Couldn't open file "nonexistent_file"
    22cavern: error: No survey data
  • tests/badinc2.out

    r671c8f6 r66f5fc4  
    11In file included from ./badinc2.svx:3:
    2 ./badinc.svx:3: error: Couldn't open file "nonexistent_file"
     2./badinc.svx:3:26: error: Couldn't open file "nonexistent_file"
    33cavern: error: No survey data
  • tests/badinc3.out

    r671c8f6 r66f5fc4  
    11In file included from ./badinc3.svx:3:
    22In file included from ./badinc2.svx:3:
    3 ./badinc.svx:3: error: Couldn't open file "nonexistent_file"
     3./badinc.svx:3:26: error: Couldn't open file "nonexistent_file"
    44cavern: error: No survey data
Note: See TracChangeset for help on using the changeset viewer.