From: alegrand Date: Wed, 8 Dec 2004 23:56:19 +0000 (+0000) Subject: Fixed licence and copyright. No more reference to da GRAS possee or the X-Git-Tag: v3.3~4785 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166 Fixed licence and copyright. No more reference to da GRAS possee or the OURAGAN project. Copyright is for authors. All the code is under LGPL. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@565 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/README.coding b/README.coding index 0b3b6b71bf..1f31d9c0b4 100644 --- a/README.coding +++ b/README.coding @@ -135,7 +135,7 @@ un exemple). Une fois la section crée, un "make -C doc" crée un bout de doc, mais ne l'inclue pas dans la documentation finale. Pour cela, il faut éditer le -fichier gras-docs.sgml (qui est un fichier xml de bon aloi, malgrès son +fichier gras-docs.sgml (qui est un fichier xml de bon aloi, malgré son nom). Il te faut ajouter une entité système dans le prologue (avant "]>") style: Ensuite dans le corps du document, tu colles: &tbx-cfg; et t'es arrivé. Au diff --git a/examples/alnem/alnem.c b/examples/alnem/alnem.c index 23d75e87a2..c56fa46956 100644 --- a/examples/alnem/alnem.c +++ b/examples/alnem/alnem.c @@ -2,11 +2,11 @@ /* ALNeM itself */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include #include diff --git a/examples/alnem/alnem_builder.c b/examples/alnem/alnem_builder.c index 3077cb6c9c..b80fe6cc8e 100644 --- a/examples/alnem/alnem_builder.c +++ b/examples/alnem/alnem_builder.c @@ -3,11 +3,10 @@ /* ALNeM builder. Take an interference matrix as argument, */ /* and reconstruct the corresponding graph itself */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include diff --git a/examples/bandwidth/bandwidth.c b/examples/bandwidth/bandwidth.c index ecb3b18e8d..508c0a1874 100644 --- a/examples/bandwidth/bandwidth.c +++ b/examples/bandwidth/bandwidth.c @@ -2,11 +2,11 @@ /* bandwidth - bandwidth test demo of GRAS features */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "gras.h" #include "amok/bandwidth.h" diff --git a/examples/ping/ping.c b/examples/ping/ping.c index b58078d0de..77c43cfa36 100644 --- a/examples/ping/ping.c +++ b/examples/ping/ping.c @@ -2,11 +2,10 @@ /* ping - ping/pong demo of GRAS features */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/examples/saturate/saturate.c b/examples/saturate/saturate.c index 082adf41fb..6170e0f410 100644 --- a/examples/saturate/saturate.c +++ b/examples/saturate/saturate.c @@ -1,12 +1,11 @@ /* $Id$ */ /* saturate - link saturation demo of GRAS features */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ -/* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h index f08950670e..22da712d39 100644 --- a/include/amok/bandwidth.h +++ b/include/amok/bandwidth.h @@ -2,11 +2,10 @@ /* amok_bandwidth - Bandwidth test facilities */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef AMOK_BANDWIDTH_H #define AMOK_BANDWIDTH_H diff --git a/include/amok/base.h b/include/amok/base.h index 7d1fd32627..0439f7f182 100644 --- a/include/amok/base.h +++ b/include/amok/base.h @@ -2,11 +2,10 @@ /* amok_base - things needed in amok, but too small to constitute a module */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef AMOK_BASE_H #define AMOK_BASE_H diff --git a/include/gras.h b/include/gras.h index 4f479d48ee..b5194598ab 100644 --- a/include/gras.h +++ b/include/gras.h @@ -2,11 +2,10 @@ /* gras.h - Public interface to the GRAS */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_H #define GRAS_H diff --git a/include/gras/cond.h b/include/gras/cond.h index 42ca8dbd5b..100e1b22e8 100644 --- a/include/gras/cond.h +++ b/include/gras/cond.h @@ -3,11 +3,10 @@ /* gras/cond.h - public interface to conditional execution */ /* (specific parts for SG or RL) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_COND_H #define GRAS_COND_H diff --git a/include/gras/core.h b/include/gras/core.h index 4e79a50760..3e2efcecbb 100644 --- a/include/gras/core.h +++ b/include/gras/core.h @@ -2,11 +2,10 @@ /* gras/core.h - Unsorted part of the GRAS public interface */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_CORE_H #define GRAS_CORE_H diff --git a/include/gras/datadesc.h b/include/gras/datadesc.h index 1285057111..426c1754b4 100644 --- a/include/gras/datadesc.h +++ b/include/gras/datadesc.h @@ -2,11 +2,10 @@ /* gras/datadesc.h - Describing the data you want to exchange */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_DATADESC_H #define GRAS_DATADESC_H diff --git a/include/gras/messages.h b/include/gras/messages.h index 88ae103f98..1f891d12a8 100644 --- a/include/gras/messages.h +++ b/include/gras/messages.h @@ -1,15 +1,12 @@ /* $Id$ */ /* messaging - high level communication (send/receive messages) */ - /* module's public interface exported to end user. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ - + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_MESSAGES_H #define GRAS_MESSAGES_H diff --git a/include/gras/modules/bandwidth.h b/include/gras/modules/bandwidth.h index 13e4b632d5..6b1fa8e3ef 100644 --- a/include/gras/modules/bandwidth.h +++ b/include/gras/modules/bandwidth.h @@ -2,11 +2,10 @@ /* gras_bandwidth - GRAS mecanism to do Bandwidth tests between to hosts */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_BANDWIDTH_H #define GRAS_BANDWIDTH_H diff --git a/include/gras/modules/base.h b/include/gras/modules/base.h index 482e537565..432499ca90 100644 --- a/include/gras/modules/base.h +++ b/include/gras/modules/base.h @@ -2,11 +2,10 @@ /* gras_addons - several addons to do specific stuff not in GRAS itself */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_ADDONS_H #define GRAS_ADDONS_H diff --git a/include/gras/process.h b/include/gras/process.h index 5c7047bbe2..52614823ef 100644 --- a/include/gras/process.h +++ b/include/gras/process.h @@ -2,11 +2,10 @@ /* gras/core.h - Unsorted part of the GRAS public interface */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_PROCESS_H #define GRAS_PROCESS_H diff --git a/include/gras/transport.h b/include/gras/transport.h index f87833e1b2..db4df12aa7 100644 --- a/include/gras/transport.h +++ b/include/gras/transport.h @@ -1,14 +1,12 @@ /* $Id$ */ /* transport - low level communication (send/receive bunches of bytes) */ - /* module's public interface exported to end user. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_TRANSPORT_H #define GRAS_TRANSPORT_H diff --git a/include/gras/virtu.h b/include/gras/virtu.h index 2669f23ab0..c3a50d9f0e 100644 --- a/include/gras/virtu.h +++ b/include/gras/virtu.h @@ -2,11 +2,10 @@ /* gras/virtu.h - public interface to virtualization (cross-OS portability) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_VIRTU_H #define GRAS_VIRTU_H diff --git a/include/xbt.h b/include/xbt.h index 57243f486d..6af44f12a8 100644 --- a/include/xbt.h +++ b/include/xbt.h @@ -2,23 +2,14 @@ /* xbt.h - Public interface to the xbt (gras's toolbox) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef xbt_H #define xbt_H -#define max(a, b) (((a) > (b))?(a):(b)) -#define min(a, b) (((a) < (b))?(a):(b)) - -#define TRUE 1 -#define FALSE 0 - -#define XBT_MAX_CHANNEL 10 /* FIXME: killme */ - #include #include @@ -29,6 +20,8 @@ #include #include #include +#include +#include #include diff --git a/include/xbt/config.h b/include/xbt/config.h index a4311ac82f..54472225df 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -4,11 +4,10 @@ /* This is useful to build named structs, like option or property sets. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2001,2002,2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_CONFIG_H_ #define _XBT_CONFIG_H_ diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 1837700c75..f16188bbdc 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -2,11 +2,10 @@ /* xbt/dict.h -- api to a generic dictionary */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_DICT_H diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index d793aacb1c..bfdcd508c2 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -2,11 +2,10 @@ /* dynar - a generic dynamic array */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_DYNAR_H #define _XBT_DYNAR_H diff --git a/include/xbt/error.h b/include/xbt/error.h index 46df96bc67..63af9b353f 100644 --- a/include/xbt/error.h +++ b/include/xbt/error.h @@ -2,12 +2,10 @@ /* xbt/error.h - Error tracking support */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ - + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef XBT_ERROR_H #define XBT_ERROR_H diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 33fa27af1e..0993cacbfc 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_FIFO_H #define _XBT_FIFO_H diff --git a/include/xbt/heap.h b/include/xbt/heap.h index 56f0ef189b..4226968f3f 100644 --- a/include/xbt/heap.h +++ b/include/xbt/heap.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_HEAP_H #define _XBT_HEAP_H diff --git a/include/xbt/log.h b/include/xbt/log.h index c565a132b1..35b233ad41 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -2,11 +2,10 @@ /* log - a generic logging facility in the spirit of log4j */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ /* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic printf function. Useful to debug the logging facilities themselves */ diff --git a/include/xbt/misc.h b/include/xbt/misc.h index af16b984b4..98e18f93dc 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -2,11 +2,10 @@ /* xbt.h - Public interface to the xbt (gras's toolbox) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef XBT_MISC_H #define XBT_MISC_H diff --git a/include/xbt/module.h b/include/xbt/module.h index d2ce7aaea2..7b813a50b7 100644 --- a/include/xbt/module.h +++ b/include/xbt/module.h @@ -2,11 +2,10 @@ /* module - modularize the code */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_MODULE_H #define _XBT_MODULE_H diff --git a/include/xbt/set.h b/include/xbt/set.h index b3a6dd7c93..69a2a1fab6 100644 --- a/include/xbt/set.h +++ b/include/xbt/set.h @@ -2,12 +2,10 @@ /* xbt/set.h -- api to a generic dictionary */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ - + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_SET_H #define _XBT_SET_H diff --git a/include/xbt/swag.h b/include/xbt/swag.h index c8a7331e0e..64e07f80c7 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -1,18 +1,19 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ /* Warning, this module is done to be efficient and performs tons of cast and dirty things. So avoid using it unless you really know what you are doing. */ +#include "xbt/sysdep.h" + /* This type should be added to a type that is to be used in such a swag */ /* Whenever a new object with this struct is created, all fields have to be set to NULL */ - -#include "xbt/sysdep.h" - typedef struct xbt_swag_hookup { void *next; void *prev; diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 31175d6160..9435c96a57 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -4,12 +4,10 @@ /* no system header should be loaded out of this file so that we have only */ /* one file to check when porting to another OS */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ - + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_SYSDEP_H #define _XBT_SYSDEP_H diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c index d0d82a6980..2f5580353f 100644 --- a/src/amok/Bandwidth/bandwidth.c +++ b/src/amok/Bandwidth/bandwidth.c @@ -2,11 +2,10 @@ /* amok_bandwidth - Bandwidth tests facilities */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "amok/Bandwidth/bandwidth_private.h" #include "gras/messages.h" diff --git a/src/amok/Bandwidth/bandwidth_private.h b/src/amok/Bandwidth/bandwidth_private.h index c05cf0a0b9..fb8ea80d07 100644 --- a/src/amok/Bandwidth/bandwidth_private.h +++ b/src/amok/Bandwidth/bandwidth_private.h @@ -4,11 +4,11 @@ /* module's private interface masked even to other parts of AMOK. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ + #ifndef AMOK_BANDWIDTH_PRIVATE_H #define AMOK_BANDWIDTH_PRIVATE_H diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c index 40b7894244..c768bee826 100644 --- a/src/amok/Bandwidth/saturate.c +++ b/src/amok/Bandwidth/saturate.c @@ -2,11 +2,10 @@ /* amok_saturate - Link saturating facilities (for ALNeM's BW testing) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "amok/Bandwidth/bandwidth_private.h" diff --git a/src/amok/bandwidth.c b/src/amok/bandwidth.c index a46bb355d5..daaf0c3aac 100644 --- a/src/amok/bandwidth.c +++ b/src/amok/bandwidth.c @@ -2,11 +2,10 @@ /* amok_bandwidth - Bandwidth tests facilities */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/src/amok/base.c b/src/amok/base.c index 2474e95007..4796e2e689 100644 --- a/src/amok/base.c +++ b/src/amok/base.c @@ -2,11 +2,10 @@ /* base - several addons to do specific stuff not in GRAS itself */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/error.h" #include "gras/datadesc.h" diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c index ad50759c61..646fa440a9 100644 --- a/src/gras/DataDesc/cbps.c +++ b/src/gras/DataDesc/cbps.c @@ -2,11 +2,10 @@ /* cbps - persistant states for callbacks */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 da GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/DataDesc/datadesc_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state"); diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c index 03c8c8f81d..fb3e50fceb 100644 --- a/src/gras/DataDesc/datadesc.c +++ b/src/gras/DataDesc/datadesc.c @@ -2,11 +2,10 @@ /* datadesc - data description in order to send/recv it in GRAS */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/DataDesc/datadesc_private.h" diff --git a/src/gras/DataDesc/datadesc_interface.h b/src/gras/DataDesc/datadesc_interface.h index 9ab2517922..078d61f410 100644 --- a/src/gras/DataDesc/datadesc_interface.h +++ b/src/gras/DataDesc/datadesc_interface.h @@ -4,11 +4,10 @@ /* module's public interface exported within GRAS, but not to end user. */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_DATADESC_INTERFACE_H #define GRAS_DATADESC_INTERFACE_H diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h index 6206440054..64b216764f 100644 --- a/src/gras/DataDesc/datadesc_private.h +++ b/src/gras/DataDesc/datadesc_private.h @@ -4,11 +4,10 @@ /* module's private interface masked even to other parts of GRAS. */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_DATADESC_PRIVATE_H #define GRAS_DATADESC_PRIVATE_H diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c index efc4946f04..316928902a 100644 --- a/src/gras/DataDesc/ddt_convert.c +++ b/src/gras/DataDesc/ddt_convert.c @@ -2,11 +2,10 @@ /* ddt_remote - Stuff needed to get datadescs about remote hosts */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ /************************************************************************/ /* C combines the power of assembler with the portability of assembler. */ diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index 9bd48b7c5c..3a91cb5c06 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -2,11 +2,10 @@ /* ddt_new - creation/deletion of datatypes structs (private to this module)*/ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" /* min()/max() */ #include "gras/DataDesc/datadesc_private.h" diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index 09d56c148a..ef09295dbf 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -2,11 +2,10 @@ /* ddt_exchange - send/recv data described */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/DataDesc/datadesc_private.h" #include "gras/Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c index abda4cd807..afaa8c5e24 100644 --- a/src/gras/DataDesc/ddt_parse.c +++ b/src/gras/DataDesc/ddt_parse.c @@ -2,11 +2,10 @@ /* DataDesc/ddt_parse.c -- automatic parsing of data structures */ -/* Authors: Arnaud Legrand, Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Arnaud Legrand, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include /* isdigit */ diff --git a/src/gras/DataDesc/ddt_parse.yy.c b/src/gras/DataDesc/ddt_parse.yy.c index f184f044bc..eb241b8ef9 100644 --- a/src/gras/DataDesc/ddt_parse.yy.c +++ b/src/gras/DataDesc/ddt_parse.yy.c @@ -1,51 +1,85 @@ -#define yy_create_buffer gras_ddt_parse__create_buffer -#define yy_delete_buffer gras_ddt_parse__delete_buffer -#define yy_scan_buffer gras_ddt_parse__scan_buffer -#define yy_scan_string gras_ddt_parse__scan_string -#define yy_scan_bytes gras_ddt_parse__scan_bytes -#define yy_flex_debug gras_ddt_parse__flex_debug -#define yy_init_buffer gras_ddt_parse__init_buffer -#define yy_flush_buffer gras_ddt_parse__flush_buffer -#define yy_load_buffer_state gras_ddt_parse__load_buffer_state -#define yy_switch_to_buffer gras_ddt_parse__switch_to_buffer -#define yyin gras_ddt_parse_in -#define yyleng gras_ddt_parse_leng -#define yylex gras_ddt_parse_lex -#define yyout gras_ddt_parse_out -#define yyrestart gras_ddt_parse_restart -#define yytext gras_ddt_parse_text - -#line 19 "gras/DataDesc/ddt_parse.yy.c" -/* A lexical scanner generated by flex */ +#line 2 "gras/DataDesc/ddt_parse.yy.c" -/* Scanner skeleton version: - * $Header$ - */ +#line 4 "gras/DataDesc/ddt_parse.yy.c" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 31 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ +/* begin standard C headers. */ #include +#include #include +#include -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif -#endif +/* end standard C headers. */ +/* flex integer type definitions */ -#ifdef __cplusplus +#ifndef FLEXINT_H +#define FLEXINT_H -#include -#ifndef _WIN32 -#include +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) #endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS +#ifdef __cplusplus /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -54,35 +88,17 @@ #if __STDC__ -#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -97,71 +113,71 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE gras_ddt_parse_restart(gras_ddt_parse_in ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +extern int gras_ddt_parse_leng; -extern int yyleng; -extern FILE *yyin, *yyout; +extern FILE *gras_ddt_parse_in, *gras_ddt_parse_out; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ - /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + /* Undo effects of setting up gras_ddt_parse_text. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up gras_ddt_parse_text again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) +#define unput(c) yyunput( c, (yytext_ptr) ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). */ -typedef unsigned int yy_size_t; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef unsigned int yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -198,12 +214,16 @@ struct yy_buffer_state */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -213,102 +233,138 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. + * (via gras_ddt_parse_restart()), so that the user can continue scanning by + * just pointing gras_ddt_parse_in at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] -/* yy_hold_char holds the character lost when yytext is formed. */ +/* yy_hold_char holds the character lost when gras_ddt_parse_text is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - -int yyleng; +int gras_ddt_parse_leng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; static int yy_init = 1; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... +/* Flag which is used to allow gras_ddt_parse_wrap()'s to do buffer switches + * instead of setting up a fresh gras_ddt_parse_in. A bit of a hack ... */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); +void gras_ddt_parse_restart (FILE *input_file ); +void gras_ddt_parse__switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE gras_ddt_parse__create_buffer (FILE *file,int size ); +void gras_ddt_parse__delete_buffer (YY_BUFFER_STATE b ); +void gras_ddt_parse__flush_buffer (YY_BUFFER_STATE b ); +void gras_ddt_parse_push_buffer_state (YY_BUFFER_STATE new_buffer ); +void gras_ddt_parse_pop_buffer_state (void ); -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) +static void gras_ddt_parse_ensure_buffer_stack (void ); +static void gras_ddt_parse__load_buffer_state (void ); +static void gras_ddt_parse__init_buffer (YY_BUFFER_STATE b,FILE *file ); -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); +#define YY_FLUSH_BUFFER gras_ddt_parse__flush_buffer(YY_CURRENT_BUFFER ) -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); +YY_BUFFER_STATE gras_ddt_parse__scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE gras_ddt_parse__scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE gras_ddt_parse__scan_bytes (yyconst char *bytes,int len ); -#define yy_new_buffer yy_create_buffer +void *gras_ddt_parse_alloc (yy_size_t ); +void *gras_ddt_parse_realloc (void *,yy_size_t ); +void gras_ddt_parse_free (void * ); + +#define yy_new_buffer gras_ddt_parse__create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + gras_ddt_parse_ensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + gras_ddt_parse__create_buffer(gras_ddt_parse_in,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + gras_ddt_parse_ensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + gras_ddt_parse__create_buffer(gras_ddt_parse_in,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) +/* Begin user sect3 */ -#define yywrap() 1 +#define gras_ddt_parse_wrap(n) 1 #define YY_SKIP_YYWRAP + typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + +FILE *gras_ddt_parse_in = (FILE *) 0, *gras_ddt_parse_out = (FILE *) 0; + typedef int yy_state_type; -extern char *yytext; -#define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +extern int gras_ddt_parse_lineno; + +int gras_ddt_parse_lineno = 1; + +extern char *gras_ddt_parse_text; +#define yytext_ptr gras_ddt_parse_text + +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. + * corresponding action - sets up gras_ddt_parse_text. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + gras_ddt_parse_leng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 26 #define YY_END_OF_BUFFER 27 -static yyconst short int yy_accept[61] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[61] = { 0, 14, 14, 7, 7, 10, 10, 0, 0, 27, 25, 24, 19, 20, 21, 23, 14, 25, 22, 17, 18, @@ -318,7 +374,7 @@ static yyconst short int yy_accept[61] = 3, 0, 2, 0, 3, 0, 0, 8, 9, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -350,13 +406,13 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[18] = +static yyconst flex_int32_t yy_meta[18] = { 0, 1, 1, 2, 1, 1, 3, 1, 4, 1, 4, 1, 1, 1, 1, 4, 1, 1 } ; -static yyconst short int yy_base[69] = +static yyconst flex_int16_t yy_base[69] = { 0, 0, 0, 16, 30, 17, 18, 78, 77, 85, 88, 88, 88, 88, 88, 88, 0, 19, 88, 88, 88, @@ -367,7 +423,7 @@ static yyconst short int yy_base[69] = 45, 49, 53, 55, 57, 61, 65, 69 } ; -static yyconst short int yy_def[69] = +static yyconst flex_int16_t yy_def[69] = { 0, 60, 1, 61, 61, 62, 62, 63, 63, 60, 60, 60, 60, 60, 60, 60, 64, 60, 60, 60, 60, @@ -378,7 +434,7 @@ static yyconst short int yy_def[69] = 60, 60, 60, 60, 60, 60, 60, 60 } ; -static yyconst short int yy_nxt[106] = +static yyconst flex_int16_t yy_nxt[106] = { 0, 10, 10, 11, 12, 13, 14, 15, 16, 17, 16, 18, 19, 20, 10, 16, 21, 22, 24, 25, 29, @@ -394,7 +450,7 @@ static yyconst short int yy_nxt[106] = 60, 60, 60, 60, 60 } ; -static yyconst short int yy_chk[106] = +static yyconst flex_int16_t yy_chk[106] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 5, @@ -413,6 +469,9 @@ static yyconst short int yy_chk[106] = static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int gras_ddt_parse__flex_debug; +int gras_ddt_parse__flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -420,16 +479,14 @@ static char *yy_last_accepting_cpos; #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -char *yytext; +char *gras_ddt_parse_text; #line 1 "gras/DataDesc/ddt_parse.yy.l" -#define INITIAL 0 /* $Id$ */ /* DataDesc/ddt_parse -- automatic parsing of data structures */ -/* Authors: Arnaud Legrand, Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Arnaud Legrand, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ -#line 13 "gras/DataDesc/ddt_parse.yy.l" + * under the terms of the license (GNU LGPL) which comes with this package. */ +#line 12 "gras/DataDesc/ddt_parse.yy.l" #include "gras/DataDesc/datadesc_private.h" #include "gras/DataDesc/ddt_parse.yy.h" #include @@ -442,12 +499,26 @@ char *yytext; int gras_ddt_parse_tok_num = 0; const char *definition; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lexer,ddt_parse,"The crude internals of the lexer used for type parsing"); -#define SHOW_WHERE DEBUG4("%d:%d (char #%d): seen '%s'", gras_ddt_parse_line_pos,gras_ddt_parse_col_pos,gras_ddt_parse_char_pos,yytext) +#define SHOW_WHERE DEBUG4("%d:%d (char #%d): seen '%s'", gras_ddt_parse_line_pos,gras_ddt_parse_col_pos,gras_ddt_parse_char_pos,gras_ddt_parse_text) + +#line 505 "gras/DataDesc/ddt_parse.yy.c" + +#define INITIAL 0 #define annotate 1 #define comment 2 #define foo 3 -#line 451 "gras/DataDesc/ddt_parse.yy.c" +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif /* Macros after this point can all be overridden by user definitions in * section 1. @@ -455,65 +526,30 @@ char *yytext; #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int gras_ddt_parse_wrap (void ); #else -extern int yywrap YY_PROTO(( void )); -#endif +extern int gras_ddt_parse_wrap (void ); #endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); #endif + static void yyunput (int c,char *buf_ptr ); + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -522,12 +558,11 @@ YY_MALLOC_DECL #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO (void) fwrite( gras_ddt_parse_text, gras_ddt_parse_leng, 1, gras_ddt_parse_out ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -535,22 +570,23 @@ YY_MALLOC_DECL */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + (c = getc( gras_ddt_parse_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ) \ buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ + if ( c == EOF && ferror( gras_ddt_parse_in ) ) \ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = fread(buf, 1, max_size, gras_ddt_parse_in))==0 && ferror(gras_ddt_parse_in)) \ { \ if( errno != EINTR) \ { \ @@ -558,9 +594,11 @@ YY_MALLOC_DECL break; \ } \ errno=0; \ - clearerr(yyin); \ + clearerr(gras_ddt_parse_in); \ } \ - } + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -581,14 +619,20 @@ YY_MALLOC_DECL #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int gras_ddt_parse_lex (void); + +#define YY_DECL int gras_ddt_parse_lex (void) +#endif /* !YY_DECL */ -/* Code executed at the beginning of each rule, after yytext and yyleng +/* Code executed at the beginning of each rule, after gras_ddt_parse_text and gras_ddt_parse_leng * have been set up. */ #ifndef YY_USER_ACTION @@ -603,13 +647,15 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - -#line 33 "gras/DataDesc/ddt_parse.yy.l" + +#line 32 "gras/DataDesc/ddt_parse.yy.l" int comment_caller=0; int annotate_caller=0; @@ -617,53 +663,55 @@ YY_DECL char string_buf[GRAS_DDT_PARSE_MAX_STR_CONST]; char *string_buf_ptr = NULL; -#line 621 "gras/DataDesc/ddt_parse.yy.c" +#line 667 "gras/DataDesc/ddt_parse.yy.c" - if ( yy_init ) + if ( (yy_init) ) { - yy_init = 0; + (yy_init) = 0; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ - if ( ! yyin ) - yyin = stdin; + if ( ! gras_ddt_parse_in ) + gras_ddt_parse_in = stdin; - if ( ! yyout ) - yyout = stdout; + if ( ! gras_ddt_parse_out ) + gras_ddt_parse_out = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + if ( ! YY_CURRENT_BUFFER ) { + gras_ddt_parse_ensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + gras_ddt_parse__create_buffer(gras_ddt_parse_in,YY_BUF_SIZE ); + } - yy_load_buffer_state(); + gras_ddt_parse__load_buffer_state( ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); - /* Support of yytext. */ - *yy_cp = yy_hold_char; + /* Support of gras_ddt_parse_text. */ + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -680,89 +728,88 @@ yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: YY_RULE_SETUP -#line 40 "gras/DataDesc/ddt_parse.yy.l" +#line 39 "gras/DataDesc/ddt_parse.yy.l" YY_BREAK case 2: YY_RULE_SETUP -#line 42 "gras/DataDesc/ddt_parse.yy.l" +#line 41 "gras/DataDesc/ddt_parse.yy.l" { /****************** ANNOTATION ************************/ DEBUG0("Begin annotation"); annotate_caller = INITIAL; - gras_ddt_parse_char_pos+= strlen(yytext); - gras_ddt_parse_col_pos+= strlen(yytext); + gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text); + gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text); BEGIN(annotate); } YY_BREAK case 3: YY_RULE_SETUP -#line 49 "gras/DataDesc/ddt_parse.yy.l" +#line 48 "gras/DataDesc/ddt_parse.yy.l" { /* trim annotation */ DEBUG0("Begin annotation"); annotate_caller = foo; - gras_ddt_parse_char_pos+= strlen(yytext); - gras_ddt_parse_col_pos+= strlen(yytext); + gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text); + gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text); BEGIN(annotate); } YY_BREAK case 4: YY_RULE_SETUP -#line 57 "gras/DataDesc/ddt_parse.yy.l" +#line 56 "gras/DataDesc/ddt_parse.yy.l" { DEBUG0("End annotation"); - gras_ddt_parse_char_pos+= strlen(yytext); - gras_ddt_parse_col_pos+= strlen(yytext); + gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text); + gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text); BEGIN(annotate_caller); } YY_BREAK case 5: YY_RULE_SETUP -#line 64 "gras/DataDesc/ddt_parse.yy.l" +#line 63 "gras/DataDesc/ddt_parse.yy.l" { PARSE_ERROR0("``/*g'' construct closed by a regular ``*/''"); } YY_BREAK case 6: +/* rule 6 can match eol */ YY_RULE_SETUP -#line 67 "gras/DataDesc/ddt_parse.yy.l" +#line 66 "gras/DataDesc/ddt_parse.yy.l" { PARSE_ERROR0("Type annotation cannot spread over several lines"); } YY_BREAK case 7: YY_RULE_SETUP -#line 71 "gras/DataDesc/ddt_parse.yy.l" +#line 70 "gras/DataDesc/ddt_parse.yy.l" { /* eat the rest */ - gras_ddt_parse_char_pos+= strlen(yytext); - gras_ddt_parse_col_pos+= strlen(yytext); + gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text); + gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text); return GRAS_DDT_PARSE_TOKEN_ANNOTATE; } YY_BREAK case 8: YY_RULE_SETUP -#line 77 "gras/DataDesc/ddt_parse.yy.l" +#line 76 "gras/DataDesc/ddt_parse.yy.l" { /****************** COMMENTS ************************/ /* constructs like : */ /*g [string] g*/ @@ -773,7 +820,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 85 "gras/DataDesc/ddt_parse.yy.l" +#line 84 "gras/DataDesc/ddt_parse.yy.l" { comment_caller = foo; BEGIN(comment); @@ -781,19 +828,20 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 90 "gras/DataDesc/ddt_parse.yy.l" +#line 89 "gras/DataDesc/ddt_parse.yy.l" { /* eat anything that's not a '*' */ } YY_BREAK case 11: YY_RULE_SETUP -#line 92 "gras/DataDesc/ddt_parse.yy.l" +#line 91 "gras/DataDesc/ddt_parse.yy.l" { /* eat up '*'s not followed by '/'s */ } YY_BREAK case 12: +/* rule 12 can match eol */ YY_RULE_SETUP -#line 94 "gras/DataDesc/ddt_parse.yy.l" +#line 93 "gras/DataDesc/ddt_parse.yy.l" { ++gras_ddt_parse_line_pos; gras_ddt_parse_col_pos=0; @@ -802,26 +850,26 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 99 "gras/DataDesc/ddt_parse.yy.l" +#line 98 "gras/DataDesc/ddt_parse.yy.l" { - gras_ddt_parse_char_pos+= strlen(yytext); - gras_ddt_parse_col_pos+= strlen(yytext); + gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text); + gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text); BEGIN(comment_caller); } YY_BREAK case 14: YY_RULE_SETUP -#line 105 "gras/DataDesc/ddt_parse.yy.l" +#line 104 "gras/DataDesc/ddt_parse.yy.l" { /****************** STATEMENTS ************************/ - gras_ddt_parse_char_pos += strlen(yytext); - gras_ddt_parse_col_pos += strlen(yytext); + gras_ddt_parse_char_pos += strlen(gras_ddt_parse_text); + gras_ddt_parse_col_pos += strlen(gras_ddt_parse_text); SHOW_WHERE; return(GRAS_DDT_PARSE_TOKEN_WORD); } YY_BREAK case 15: YY_RULE_SETUP -#line 111 "gras/DataDesc/ddt_parse.yy.l" +#line 110 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -831,7 +879,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 117 "gras/DataDesc/ddt_parse.yy.l" +#line 116 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -841,7 +889,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 123 "gras/DataDesc/ddt_parse.yy.l" +#line 122 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -851,7 +899,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 129 "gras/DataDesc/ddt_parse.yy.l" +#line 128 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -861,7 +909,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 135 "gras/DataDesc/ddt_parse.yy.l" +#line 134 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -871,7 +919,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 141 "gras/DataDesc/ddt_parse.yy.l" +#line 140 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -881,7 +929,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 147 "gras/DataDesc/ddt_parse.yy.l" +#line 146 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -891,7 +939,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 153 "gras/DataDesc/ddt_parse.yy.l" +#line 152 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -901,7 +949,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 159 "gras/DataDesc/ddt_parse.yy.l" +#line 158 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -910,8 +958,9 @@ YY_RULE_SETUP } YY_BREAK case 24: +/* rule 24 can match eol */ YY_RULE_SETUP -#line 165 "gras/DataDesc/ddt_parse.yy.l" +#line 164 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_line_pos++; gras_ddt_parse_char_pos++; @@ -921,7 +970,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 171 "gras/DataDesc/ddt_parse.yy.l" +#line 170 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -930,10 +979,10 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 176 "gras/DataDesc/ddt_parse.yy.l" +#line 175 "gras/DataDesc/ddt_parse.yy.l" ECHO; YY_BREAK -#line 937 "gras/DataDesc/ddt_parse.yy.c" +#line 986 "gras/DataDesc/ddt_parse.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(annotate): case YY_STATE_EOF(comment): @@ -943,26 +992,26 @@ case YY_STATE_EOF(foo): case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * just pointed gras_ddt_parse_in at a new source and called + * gras_ddt_parse_lex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = gras_ddt_parse_in; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -972,13 +1021,13 @@ case YY_STATE_EOF(foo): * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -991,41 +1040,41 @@ case YY_STATE_EOF(foo): yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( gras_ddt_parse_wrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up - * yytext, we can now set up + * gras_ddt_parse_text, we can now set up * yy_c_buf_p so that if some total * hoser (like flex itself) wants to * call the scanner after we return the * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1033,30 +1082,30 @@ case YY_STATE_EOF(foo): else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1067,8 +1116,7 @@ case YY_STATE_EOF(foo): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of gras_ddt_parse_lex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1077,21 +1125,20 @@ case YY_STATE_EOF(foo): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1111,34 +1158,30 @@ static int yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + size_t num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1151,8 +1194,7 @@ static int yy_get_next_buffer() b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + gras_ddt_parse_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -1162,35 +1204,35 @@ static int yy_get_next_buffer() YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + gras_ddt_parse_restart(gras_ddt_parse_in ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1198,32 +1240,31 @@ static int yy_get_next_buffer() else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } - +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1235,30 +1276,23 @@ static yy_state_type yy_get_previous_state() } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1270,80 +1304,73 @@ yy_state_type yy_current_state; yy_is_jam = (yy_current_state == 60); return yy_is_jam ? 0 : yy_current_state; - } - +} -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); - /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + /* undo effects of setting up gras_ddt_parse_text */ + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1357,16 +1384,16 @@ static int input() */ /* Reset buffer status. */ - yyrestart( yyin ); + gras_ddt_parse_restart(gras_ddt_parse_in ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( gras_ddt_parse_wrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -1376,176 +1403,169 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve gras_ddt_parse_text */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void gras_ddt_parse_restart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + gras_ddt_parse_ensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + gras_ddt_parse__create_buffer(gras_ddt_parse_in,YY_BUF_SIZE ); } + gras_ddt_parse__init_buffer(YY_CURRENT_BUFFER,input_file ); + gras_ddt_parse__load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void gras_ddt_parse__switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * gras_ddt_parse_pop_buffer_state(); + * gras_ddt_parse_push_buffer_state(new_buffer); + */ + gras_ddt_parse_ensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + gras_ddt_parse__load_buffer_state( ); /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe + * EOF (gras_ddt_parse_wrap()) processing, but the only time this flag + * is looked at is after gras_ddt_parse_wrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void gras_ddt_parse__load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + gras_ddt_parse_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE gras_ddt_parse__create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) gras_ddt_parse_alloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in gras_ddt_parse__create_buffer()" ); b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) gras_ddt_parse_alloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in gras_ddt_parse__create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + gras_ddt_parse__init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with gras_ddt_parse__create_buffer() + * + */ + void gras_ddt_parse__delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); - - yy_flex_free( (void *) b ); - } + gras_ddt_parse_free((void *) b->yy_ch_buf ); + gras_ddt_parse_free((void *) b ); +} -#ifndef _WIN32 -#include -#else -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif -#endif - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif - +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a gras_ddt_parse_restart() or at EOF. + */ + static void gras_ddt_parse__init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + gras_ddt_parse__flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - - -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + /* If b is the current buffer, then gras_ddt_parse__init_buffer was _probably_ + * called from gras_ddt_parse_restart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void gras_ddt_parse__flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -1562,31 +1582,123 @@ YY_BUFFER_STATE b; b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + gras_ddt_parse__load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void gras_ddt_parse_push_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + gras_ddt_parse_ensure_buffer_stack(); + + /* This block is copied from gras_ddt_parse__switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from gras_ddt_parse__switch_to_buffer. */ + gras_ddt_parse__load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void gras_ddt_parse_pop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + gras_ddt_parse__delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + gras_ddt_parse__load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; } +} +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void gras_ddt_parse_ensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)gras_ddt_parse_alloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)gras_ddt_parse_realloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE gras_ddt_parse__scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) gras_ddt_parse_alloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in gras_ddt_parse__scan_buffer()" ); b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; @@ -1598,58 +1710,53 @@ yy_size_t size; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + gras_ddt_parse__switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to gras_ddt_parse_lex() will + * scan from a @e copy of @a str. + * @param str a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * gras_ddt_parse__scan_bytes() instead. + */ +YY_BUFFER_STATE gras_ddt_parse__scan_string (yyconst char * yy_str ) +{ + + return gras_ddt_parse__scan_bytes(yy_str,strlen(yy_str) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to gras_ddt_parse_lex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE gras_ddt_parse__scan_bytes (yyconst char * bytes, int len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; - buf = (char *) yy_flex_alloc( n ); + buf = (char *) gras_ddt_parse_alloc(n ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in gras_ddt_parse__scan_bytes()" ); for ( i = 0; i < len; ++i ) buf[i] = bytes[i]; buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = gras_ddt_parse__scan_buffer(buf,n ); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in gras_ddt_parse__scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -1657,148 +1764,164 @@ int len; b->yy_is_our_buffer = 1; return b; - } -#endif - +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +/* Redefine yyless() so it works in section 3 code. */ - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up gras_ddt_parse_text. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + gras_ddt_parse_text[gras_ddt_parse_leng] = (yy_hold_char); \ + (yy_c_buf_p) = gras_ddt_parse_text + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + gras_ddt_parse_leng = yyless_macro_arg; \ + } \ + while ( 0 ) - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +/* Accessor methods (get/set functions) to struct members. */ - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/** Get the current line number. + * + */ +int gras_ddt_parse_get_lineno (void) +{ + + return gras_ddt_parse_lineno; +} - BEGIN(new_state); - } -#endif +/** Get the input stream. + * + */ +FILE *gras_ddt_parse_get_in (void) +{ + return gras_ddt_parse_in; +} +/** Get the output stream. + * + */ +FILE *gras_ddt_parse_get_out (void) +{ + return gras_ddt_parse_out; +} -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +/** Get the length of the current token. + * + */ +int gras_ddt_parse_get_leng (void) +{ + return gras_ddt_parse_leng; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Get the current token. + * + */ +char *gras_ddt_parse_get_text (void) +{ + return gras_ddt_parse_text; +} -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +/** Set the current line number. + * @param line_number + * + */ +void gras_ddt_parse_set_lineno (int line_number ) +{ + + gras_ddt_parse_lineno = line_number; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see gras_ddt_parse__switch_to_buffer + */ +void gras_ddt_parse_set_in (FILE * in_str ) +{ + gras_ddt_parse_in = in_str ; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } +void gras_ddt_parse_set_out (FILE * out_str ) +{ + gras_ddt_parse_out = out_str ; +} +int gras_ddt_parse_get_debug (void) +{ + return gras_ddt_parse__flex_debug; +} +void gras_ddt_parse_set_debug (int bdebug ) +{ + gras_ddt_parse__flex_debug = bdebug ; +} -/* Redefine yyless() so it works in section 3 code. */ +/* gras_ddt_parse_lex_destroy is for both reentrant and non-reentrant scanners. */ +int gras_ddt_parse_lex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + gras_ddt_parse__delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + gras_ddt_parse_pop_buffer_state(); + } -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) + /* Destroy the stack itself. */ + gras_ddt_parse_free((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; - for ( i = 0; i < n; ++i ) + for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; - for ( n = 0; s[n]; ++n ) + for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *gras_ddt_parse_alloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *gras_ddt_parse_realloc (void * ptr, yy_size_t size ) +{ /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1807,26 +1930,29 @@ yy_size_t size; * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } +} -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } +void gras_ddt_parse_free (void * ptr ) +{ + free( (char *) ptr ); /* see gras_ddt_parse_realloc() for (char *) cast */ +} -#if YY_MAIN -int main() - { - yylex(); - return 0; - } +#define YYTABLES_NAME "yytables" + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef yytext_ptr +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL #endif -#line 176 "gras/DataDesc/ddt_parse.yy.l" +#line 175 "gras/DataDesc/ddt_parse.yy.l" + /* {space}+ { return(TOKEN_SPACE);} */ @@ -1841,20 +1967,20 @@ void gras_ddt_parse_dump(void) { case GRAS_DDT_PARSE_TOKEN_EMPTY : {printf("TOKEN_EMPTY\n");return;} default : {printf("Unknown token %d\n", gras_ddt_parse_tok_num);return;} } - printf("-->%s<-- [line %d, pos %d]\n",yytext,gras_ddt_parse_line_pos,gras_ddt_parse_char_pos); + printf("-->%s<-- [line %d, pos %d]\n",gras_ddt_parse_text,gras_ddt_parse_line_pos,gras_ddt_parse_char_pos); return; } int gras_ddt_parse_lex_n_dump(void) { gras_ddt_parse_tok_num = gras_ddt_parse_lex(); - /* gras_ddt_parse_char_pos += strlen(yytext);*/ + /* gras_ddt_parse_char_pos += strlen(gras_ddt_parse_text);*/ return(gras_ddt_parse_tok_num); } void gras_ddt_parse_pointer_init(const char *file) { file_to_parse = fopen(file,"r"); - input_buffer = yy_create_buffer( file_to_parse, 10 ); - yy_switch_to_buffer(input_buffer); + input_buffer = gras_ddt_parse__create_buffer(file_to_parse,10 ); + gras_ddt_parse__switch_to_buffer(input_buffer); gras_ddt_parse_line_pos = 1; gras_ddt_parse_char_pos = 0; @@ -1863,7 +1989,7 @@ void gras_ddt_parse_pointer_init(const char *file) { } void gras_ddt_parse_pointer_close(void) { - yy_delete_buffer(input_buffer); + gras_ddt_parse__delete_buffer(input_buffer); fclose(file_to_parse); gras_ddt_parse_line_pos = 1; @@ -1873,9 +1999,9 @@ void gras_ddt_parse_pointer_close(void) { void gras_ddt_parse_pointer_string_init(const char *string_to_parse) { - input_buffer = yy_scan_string (string_to_parse); + input_buffer = gras_ddt_parse__scan_string (string_to_parse); definition = string_to_parse; - yy_switch_to_buffer(input_buffer); + gras_ddt_parse__switch_to_buffer(input_buffer); gras_ddt_parse_line_pos = 1; gras_ddt_parse_char_pos = 0; @@ -1883,7 +2009,7 @@ void gras_ddt_parse_pointer_string_init(const char *string_to_parse) { } void gras_ddt_parse_pointer_string_close(void) { - yy_delete_buffer(input_buffer); + gras_ddt_parse__delete_buffer(input_buffer); gras_ddt_parse_line_pos = 1; gras_ddt_parse_char_pos = 0; @@ -1893,3 +2019,4 @@ void gras_ddt_parse_pointer_string_close(void) { /* Local variables:*/ /* mode: c */ /* End: */ + diff --git a/src/gras/DataDesc/ddt_parse.yy.h b/src/gras/DataDesc/ddt_parse.yy.h index 79bf2fe6aa..1c1f223904 100644 --- a/src/gras/DataDesc/ddt_parse.yy.h +++ b/src/gras/DataDesc/ddt_parse.yy.h @@ -2,7 +2,10 @@ /* gs/parse.h -- automatic parsing of data structures */ -/* Authors: Arnaud Legrand, Martin Quinson */ +/* Copyright (c) 2004 Arnaud Legrand, Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ typedef enum { GRAS_DDT_PARSE_TOKEN_EMPTY = 0, diff --git a/src/gras/DataDesc/ddt_parse.yy.l b/src/gras/DataDesc/ddt_parse.yy.l index 0fe83b6766..34447b8e0c 100644 --- a/src/gras/DataDesc/ddt_parse.yy.l +++ b/src/gras/DataDesc/ddt_parse.yy.l @@ -2,11 +2,10 @@ /* DataDesc/ddt_parse -- automatic parsing of data structures */ -/* Authors: Arnaud Legrand, Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Arnaud Legrand, Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ %option noyywrap %{ @@ -21,7 +20,7 @@ int gras_ddt_parse_char_pos = 0; int gras_ddt_parse_tok_num = 0; const char *definition; - GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(lexer,ddt_parse,"The crude internals of the lexer used for type parsing"); + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lexer,ddt_parse,"The crude internals of the lexer used for type parsing"); #define SHOW_WHERE DEBUG4("%d:%d (char #%d): seen '%s'", gras_ddt_parse_line_pos,gras_ddt_parse_col_pos,gras_ddt_parse_char_pos,yytext) %} diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index c197ddd637..02705dd82f 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -2,11 +2,11 @@ /* messaging - Function related to messaging (code shared between RL and SG)*/ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "gras/Msg/msg_private.h" #include "gras/DataDesc/datadesc_interface.h" diff --git a/src/gras/Msg/msg_interface.h b/src/gras/Msg/msg_interface.h index d7f016fff3..b757ded834 100644 --- a/src/gras/Msg/msg_interface.h +++ b/src/gras/Msg/msg_interface.h @@ -4,11 +4,10 @@ /* module's public interface exported within GRAS, but not to end user. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_MSG_INTERFACE_H #define GRAS_MSG_INTERFACE_H diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h index 4d4b5a6554..d376589320 100644 --- a/src/gras/Msg/msg_private.h +++ b/src/gras/Msg/msg_private.h @@ -4,11 +4,10 @@ /* module's private interface masked even to other parts of GRAS. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_MESSAGE_PRIVATE_H #define GRAS_MESSAGE_PRIVATE_H diff --git a/src/gras/RL/gras_rl.c b/src/gras/RL/gras_rl.c index f3d998d4cb..606a6f8944 100644 --- a/src/gras/RL/gras_rl.c +++ b/src/gras/RL/gras_rl.c @@ -2,11 +2,10 @@ /* gras_rl - implementation of GRAS on real life */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras_rl.h" diff --git a/src/gras/RL/gras_rl.h b/src/gras/RL/gras_rl.h index 39ed6d7fd9..9823dcac15 100644 --- a/src/gras/RL/gras_rl.h +++ b/src/gras/RL/gras_rl.h @@ -2,11 +2,10 @@ /* gras_rl.h - private interface for GRAS when on real life */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_RL_H #define GRAS_RL_H diff --git a/src/gras/SG/gras_sg.c b/src/gras/SG/gras_sg.c index b8d220fb2a..04dfd8ce40 100644 --- a/src/gras/SG/gras_sg.c +++ b/src/gras/SG/gras_sg.c @@ -2,11 +2,10 @@ /* gras_rl - implementation of GRAS on top of the SimGrid simulator */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index bd697f1532..da21e4d590 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -2,11 +2,10 @@ /* rl_transport - RL specific functions for transport */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include /* struct timeval */ diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c index 75d2d4e911..ce7d136ca6 100644 --- a/src/gras/Transport/sg_transport.c +++ b/src/gras/Transport/sg_transport.c @@ -2,11 +2,10 @@ /* sg_transport - SG specific functions for transport */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Transport/transport_private.h" #include diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 1aa3413d41..23b17fa477 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -2,11 +2,10 @@ /* transport - low level communication */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Transport/transport_private.h" diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h index 5cc5aab74d..8768045658 100644 --- a/src/gras/Transport/transport_interface.h +++ b/src/gras/Transport/transport_interface.h @@ -4,11 +4,10 @@ /* module's public interface exported within GRAS, but not to end user. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_TRP_INTERFACE_H #define GRAS_TRP_INTERFACE_H diff --git a/src/gras/Transport/transport_plugin_buf.c b/src/gras/Transport/transport_plugin_buf.c index e19f2eaa77..9b0cc6a100 100644 --- a/src/gras/Transport/transport_plugin_buf.c +++ b/src/gras/Transport/transport_plugin_buf.c @@ -2,11 +2,10 @@ /* buf trp (transport) - buffered transport using the TCP one */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include /* htonl/ntohl */ #include diff --git a/src/gras/Transport/transport_plugin_file.c b/src/gras/Transport/transport_plugin_file.c index 391d60d5c8..5386e8e859 100644 --- a/src/gras/Transport/transport_plugin_file.c +++ b/src/gras/Transport/transport_plugin_file.c @@ -2,11 +2,10 @@ /* File transport - send/receive a bunch of bytes from a file */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index 70dd24793c..2472072886 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -6,11 +6,10 @@ /* exchange in SG realm is implemented directly without mimicing real life */ /* This would be terribly unefficient. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c index f687aa5f21..55bd596073 100644 --- a/src/gras/Transport/transport_plugin_tcp.c +++ b/src/gras/Transport/transport_plugin_tcp.c @@ -2,11 +2,10 @@ /* tcp trp (transport) - send/receive a bunch of bytes from a tcp socket */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include /* close() pipe() read() write() */ #include /* close() pipe() read() write() */ diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h index ba53530580..630d887a27 100644 --- a/src/gras/Transport/transport_private.h +++ b/src/gras/Transport/transport_private.h @@ -4,11 +4,10 @@ /* module's private interface masked even to other parts of GRAS. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_TRP_PRIVATE_H #define GRAS_TRP_PRIVATE_H diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c index ffb7f1f2da..bd22889c82 100644 --- a/src/gras/Virtu/process.c +++ b/src/gras/Virtu/process.c @@ -2,11 +2,10 @@ /* process - GRAS process handling (common code for RL and SG) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/gras/Virtu/rl_conditional.c b/src/gras/Virtu/rl_conditional.c index 513df2d66d..3a8894e374 100644 --- a/src/gras/Virtu/rl_conditional.c +++ b/src/gras/Virtu/rl_conditional.c @@ -2,11 +2,10 @@ /* rl_conditional - conditional execution (real life) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/cond.h" #include "gras/Virtu/virtu_rl.h" diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c index e7343c1d57..3e3bfa2080 100644 --- a/src/gras/Virtu/rl_process.c +++ b/src/gras/Virtu/rl_process.c @@ -2,11 +2,10 @@ /* process_rl - GRAS process handling on real life */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Virtu/virtu_rl.h" diff --git a/src/gras/Virtu/rl_time.c b/src/gras/Virtu/rl_time.c index fcd0b1aebd..2b2206f93f 100644 --- a/src/gras/Virtu/rl_time.c +++ b/src/gras/Virtu/rl_time.c @@ -2,11 +2,10 @@ /* time - time related syscal wrappers */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "gras/virtu.h" diff --git a/src/gras/Virtu/sg_conditional.c b/src/gras/Virtu/sg_conditional.c index 6d1ad9378a..766804b9c9 100644 --- a/src/gras/Virtu/sg_conditional.c +++ b/src/gras/Virtu/sg_conditional.c @@ -2,11 +2,10 @@ /* sg_conditional - conditional execution (simulation) */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/cond.h" #include "gras/Virtu/virtu_sg.h" diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index cb89350825..e315a2f0bb 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -2,11 +2,10 @@ /* process_sg - GRAS process handling on simulator */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Virtu/virtu_sg.h" diff --git a/src/gras/Virtu/sg_time.c b/src/gras/Virtu/sg_time.c index 7dec70e5e3..9ed34ed657 100644 --- a/src/gras/Virtu/sg_time.c +++ b/src/gras/Virtu/sg_time.c @@ -2,11 +2,10 @@ /* time - time related syscal wrappers */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Virtu/virtu_sg.h" diff --git a/src/gras/Virtu/virtu_interface.h b/src/gras/Virtu/virtu_interface.h index c0a2c1e52b..0eff8151a6 100644 --- a/src/gras/Virtu/virtu_interface.h +++ b/src/gras/Virtu/virtu_interface.h @@ -4,11 +4,10 @@ /* module's public interface exported within GRAS, but not to end user. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_VIRTU_INTERFACE_H #define GRAS_VIRTU_INTERFACE_H diff --git a/src/gras/Virtu/virtu_rl.h b/src/gras/Virtu/virtu_rl.h index bcc59f9a7f..e64b8a5123 100644 --- a/src/gras/Virtu/virtu_rl.h +++ b/src/gras/Virtu/virtu_rl.h @@ -2,11 +2,10 @@ /* virtu_rl - specific GRAS implementation for real life */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef VIRTU_RL_H #define VIRTU_RL_H diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h index 91711e85a7..e404280a24 100644 --- a/src/gras/Virtu/virtu_sg.h +++ b/src/gras/Virtu/virtu_sg.h @@ -2,11 +2,10 @@ /* virtu_sg - specific GRAS implementation for simulator */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef VIRTU_SG_H #define VIRTU_SG_H diff --git a/src/gras_modinter.h b/src/gras_modinter.h index 8355d06815..ccf52cd784 100644 --- a/src/gras_modinter.h +++ b/src/gras_modinter.h @@ -2,11 +2,10 @@ /* gras_modinter.h - Interface to GRAS modules */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef GRAS_MODINTER_H #define GRAS_MODINTER_H diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h index a5a6bb7a1b..b75ded8685 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_MAXMIN_H #define _SURF_MAXMIN_H diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 3e0c099c3f..ebc3d5b4b0 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -1,8 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ -/* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_SURF_H #define _SURF_SURF_H diff --git a/src/include/surf/surf_parse.h b/src/include/surf/surf_parse.h index e6ced1a566..2739f26232 100644 --- a/src/include/surf/surf_parse.h +++ b/src/include/surf/surf_parse.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_SURF_PARSE_H #define _SURF_SURF_PARSE_H diff --git a/src/include/surf/trace_mgr.h b/src/include/surf/trace_mgr.h index 87999db8da..86a45b9997 100644 --- a/src/include/surf/trace_mgr.h +++ b/src/include/surf/trace_mgr.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_TMGR_H #define _SURF_TMGR_H diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 9f1265b5fd..0fa4303209 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "cpu_private.h" #include "xbt/dict.h" diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h index 9b86b44592..84249944a1 100644 --- a/src/surf/cpu_private.h +++ b/src/surf/cpu_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_CPU_PRIVATE_H #define _SURF_CPU_PRIVATE_H diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index 5300929ffd..513ad7a0c1 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -1,24 +1,16 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "xbt/sysdep.h" #include "xbt/error.h" #include "maxmin_private.h" #include -/* extern lmm_system_t Sys; */ -/* extern lmm_constraint_t L1; */ -/* extern lmm_constraint_t L2; */ -/* extern lmm_constraint_t L3; */ - -/* extern lmm_variable_t R_1_2_3; */ -/* extern lmm_variable_t R_1; */ -/* extern lmm_variable_t R_2; */ -/* extern lmm_variable_t R_3; */ - - lmm_system_t lmm_system_new(void) { lmm_system_t l = NULL; diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index a2979244f0..26ca260087 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_MAXMIN_PRIVATE_H #define _SURF_MAXMIN_PRIVATE_H diff --git a/src/surf/network.c b/src/surf/network.c index 6c0e54aa8a..f8eacea1ec 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "network_private.h" #include "xbt/dict.h" diff --git a/src/surf/network_private.h b/src/surf/network_private.h index d172dca27c..0032cd5994 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_NETWORK_PRIVATE_H #define _SURF_NETWORK_PRIVATE_H diff --git a/src/surf/surf.c b/src/surf/surf.c index ecca44c6d0..1ae58ed587 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "surf_private.h" #include "xbt/module.h" diff --git a/src/surf/surf_parse.l b/src/surf/surf_parse.l index 27034bf426..750b151d7a 100644 --- a/src/surf/surf_parse.l +++ b/src/surf/surf_parse.l @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ %option noyywrap %{ diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 7ee42c59a1..0eef6aa01c 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_SURF_PRIVATE_H #define _SURF_SURF_PRIVATE_H diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c index 979a514cf2..8eb0ca0ff1 100644 --- a/src/surf/trace_mgr.c +++ b/src/surf/trace_mgr.c @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/error.h" @@ -127,7 +129,7 @@ tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t t trace_event->resource = resource; xbt_assert0((trace_event->idx < xbt_dynar_length(trace->event_list)), - "You're refering an event that does not exist!"); + "You're refering to an event that does not exist!"); xbt_heap_push(history->heap, trace_event, start_time); diff --git a/src/surf/trace_mgr_private.h b/src/surf/trace_mgr_private.h index 0b84cdb23e..5bd6c32ffd 100644 --- a/src/surf/trace_mgr_private.h +++ b/src/surf/trace_mgr_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _SURF_TMGR_PRIVATE_H #define _SURF_TMGR_PRIVATE_H diff --git a/src/xbt/config.c b/src/xbt/config.c index 0b6474bc07..04a28f8679 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -4,11 +4,10 @@ /* This is useful to build named structs, like option or property sets. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2001,2002,2003,2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" #include "xbt/sysdep.h" diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 96a2d5e5c0..a499ab2e8d 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -2,11 +2,10 @@ /* dict - a generic dictionnary, variation over the B-tree concept */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "dict_private.h" diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 6c4538123c..bfea93e677 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -2,11 +2,10 @@ /* dict_cursor - iterators over dictionnaries */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" #include "dict_private.h" diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c index e97a91c133..8b58645b72 100644 --- a/src/xbt/dict_elm.c +++ b/src/xbt/dict_elm.c @@ -2,11 +2,10 @@ /* dict - a generic dictionnary, variation over the B-tree concept */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "dict_private.h" /* prototypes of this module */ diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c index d77a438192..0a506e8201 100644 --- a/src/xbt/dict_multi.c +++ b/src/xbt/dict_multi.c @@ -2,11 +2,10 @@ /* dict_multi - dictionnaries of dictionnaries of ... of data */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras_private.h" diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 67e5a5c795..ce8b67676c 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -3,11 +3,10 @@ /* dict_elm - elements of generic dictionnaries */ /* This file is not to be loaded from anywhere but dict.c */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_DICT_ELM_T_ #define _XBT_DICT_ELM_T_ diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index 4fa31105c1..224137c82b 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -2,11 +2,10 @@ /* a generic DYNamic ARray */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" #include "xbt/sysdep.h" diff --git a/src/xbt/fifo.c b/src/xbt/fifo.c index cb50c60391..b71e2132c6 100644 --- a/src/xbt/fifo.c +++ b/src/xbt/fifo.c @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/error.h" diff --git a/src/xbt/fifo_private.h b/src/xbt/fifo_private.h index 19d5fe1000..02470db548 100644 --- a/src/xbt/fifo_private.h +++ b/src/xbt/fifo_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_FIFO_PRIVATE_H #define _XBT_FIFO_PRIVATE_H diff --git a/src/xbt/heap.c b/src/xbt/heap.c index e30291fa9a..5ddbdf6d77 100644 --- a/src/xbt/heap.c +++ b/src/xbt/heap.c @@ -1,9 +1,11 @@ +/* $Id$ */ + /* a generic and efficient heap */ -/* Authors: Arnaud Legrand */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/error.h" @@ -13,7 +15,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(heap,xbt,"Heap"); /** * xbt_heap_new: * @init_size: initial size of the heap - * @free_func: function to call on each element when you want to free the whole heap (or NULL if nothing to do). + * @free_func: function to call on each element when you want to free + * the whole heap (or NULL if nothing to do). * * Creates a new heap. */ diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h index 59e7dbdd89..782947b25c 100644 --- a/src/xbt/heap_private.h +++ b/src/xbt/heap_private.h @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_HEAP_PRIVATE_H #define _XBT_HEAP_PRIVATE_H diff --git a/src/xbt/log.c b/src/xbt/log.c index a5a73480db..65ca648fb7 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -2,11 +2,10 @@ /* log - a generic logging facility in the spirit of log4j */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/src/xbt/log_default_appender.c b/src/xbt/log_default_appender.c index 28c5f365ef..dde8bdab89 100644 --- a/src/xbt/log_default_appender.c +++ b/src/xbt/log_default_appender.c @@ -2,11 +2,10 @@ /* file_appender - a dumb log appender which simply prints to stdout */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003, 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/xbt/module.c b/src/xbt/module.c index 5b824e8af4..25e78ea9ba 100644 --- a/src/xbt/module.c +++ b/src/xbt/module.c @@ -2,11 +2,10 @@ /* module handling */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/xbt/set.c b/src/xbt/set.c index fe1bfe4726..3df8c9d371 100644 --- a/src/xbt/set.c +++ b/src/xbt/set.c @@ -2,11 +2,10 @@ /* set - data container consisting in dict+dynar */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the GRAS posse. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" #include "xbt/sysdep.h" diff --git a/src/xbt/swag.c b/src/xbt/swag.c index 5b2f758a08..233b4c94d8 100644 --- a/src/xbt/swag.c +++ b/src/xbt/swag.c @@ -1,7 +1,9 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ /* Warning, this module is done to be efficient and performs tons of cast and dirty things. So avoid using it unless you really know diff --git a/src/xbt/sysdep.c b/src/xbt/sysdep.c index 1858dcee0f..b1dd0d294a 100644 --- a/src/xbt/sysdep.c +++ b/src/xbt/sysdep.c @@ -4,11 +4,10 @@ /* no system header should be loaded out of this file so that we have only */ /* one file to check when porting to another OS */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/xbt_modinter.h b/src/xbt_modinter.h index f2b13fec4c..1b32e6ffc5 100644 --- a/src/xbt_modinter.h +++ b/src/xbt_modinter.h @@ -2,11 +2,10 @@ /* xbt_modinter - Interface to XBT modules */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef XBT_MODINTER_H #define XBT_MODINTER_H diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c index f71516344c..7af8baf7f4 100644 --- a/testsuite/gras/datadesc_usage.c +++ b/testsuite/gras/datadesc_usage.c @@ -2,11 +2,10 @@ /* datadesc: test of data description (using file transport). */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/gras/gras_dummy.c b/testsuite/gras/gras_dummy.c index a7c5bd1eb8..005387cea4 100644 --- a/testsuite/gras/gras_dummy.c +++ b/testsuite/gras/gras_dummy.c @@ -3,12 +3,10 @@ /* gras_dummy - dummy implementation of function depending on the RL or SG, */ /* so that we can build a dummy library to test the Utils */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ - + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras_private.h" diff --git a/testsuite/gras/trp_file_client.c b/testsuite/gras/trp_file_client.c index 013c56644d..6d4b89504e 100644 --- a/testsuite/gras/trp_file_client.c +++ b/testsuite/gras/trp_file_client.c @@ -2,11 +2,10 @@ /* trp_tcp_client: Client of a test case for the tcp transport. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/gras/trp_file_server.c b/testsuite/gras/trp_file_server.c index 6bd4304fae..c38b6e671f 100644 --- a/testsuite/gras/trp_file_server.c +++ b/testsuite/gras/trp_file_server.c @@ -2,11 +2,10 @@ /* trp_tcp_server: Server of a test case for the tcp transport. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c index bba877a5a1..c21c1b6fbc 100644 --- a/testsuite/gras/trp_tcp_client.c +++ b/testsuite/gras/trp_tcp_client.c @@ -2,11 +2,10 @@ /* trp_tcp_client: Client of a test case for the tcp transport. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/gras/trp_tcp_server.c b/testsuite/gras/trp_tcp_server.c index 075d9ebe94..1623608a5b 100644 --- a/testsuite/gras/trp_tcp_server.c +++ b/testsuite/gras/trp_tcp_server.c @@ -2,11 +2,10 @@ /* trp_tcp_server: Server of a test case for the tcp transport. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/surf/maxmin_bench.c b/testsuite/surf/maxmin_bench.c index ca70060936..0e4456ac32 100644 --- a/testsuite/surf/maxmin_bench.c +++ b/testsuite/surf/maxmin_bench.c @@ -1,9 +1,11 @@ +/* $Id$ */ + /* A crash few tests for the maxmin library */ -/* Authors: Arnaud Legrand */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/surf/maxmin_usage.c b/testsuite/surf/maxmin_usage.c index 1937a6b0ac..23c2b16ea8 100644 --- a/testsuite/surf/maxmin_usage.c +++ b/testsuite/surf/maxmin_usage.c @@ -1,9 +1,11 @@ +/* $Id$ */ + /* A few tests for the maxmin library */ -/* Authors: Arnaud Legrand */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include @@ -65,7 +67,7 @@ void test(void) printf("\n"); - lmm_update_variable_weight(R_1_2_3,.5); + lmm_update_variable_weight(Sys,R_1_2_3,.5); lmm_solve(Sys); PRINT_VAR(R_1_2_3); diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index e4068ae45a..e16a8a8aab 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -1,9 +1,11 @@ +/* $Id$ */ + /* A few basic tests for the surf library */ -/* Authors: Arnaud Legrand */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include "surf/surf.h" diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c index b7267b7bab..157ee5b370 100644 --- a/testsuite/surf/trace_usage.c +++ b/testsuite/surf/trace_usage.c @@ -1,9 +1,11 @@ +/* $Id$ */ + /* A few tests for the trace library */ -/* Authors: Arnaud Legrand */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/config_usage.c b/testsuite/xbt/config_usage.c index 946fe0bc80..1f20a58423 100644 --- a/testsuite/xbt/config_usage.c +++ b/testsuite/xbt/config_usage.c @@ -2,6 +2,11 @@ /* test config - test code to the config set */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include #include diff --git a/testsuite/xbt/dict_crash.c b/testsuite/xbt/dict_crash.c index 219b930bb9..792e4222ee 100644 --- a/testsuite/xbt/dict_crash.c +++ b/testsuite/xbt/dict_crash.c @@ -2,11 +2,10 @@ /* dict_crash - A crash test for dictionnaries */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/dict_usage.c b/testsuite/xbt/dict_usage.c index 1ca353b8b3..ae87f1feca 100644 --- a/testsuite/xbt/dict_usage.c +++ b/testsuite/xbt/dict_usage.c @@ -2,11 +2,10 @@ /* dict_usage - A test of normal usage of a dictionnary */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/dynar_double.c b/testsuite/xbt/dynar_double.c index 97ce5b0b12..c32723a690 100644 --- a/testsuite/xbt/dynar_double.c +++ b/testsuite/xbt/dynar_double.c @@ -2,11 +2,10 @@ /* dynar_double: A test case for the dynar using doubles as content */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/dynar_int.c b/testsuite/xbt/dynar_int.c index a3df42bfce..01dfd52edf 100644 --- a/testsuite/xbt/dynar_int.c +++ b/testsuite/xbt/dynar_int.c @@ -2,11 +2,10 @@ /* dynar_int: A test case for the dynar using integers as content */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/dynar_string.c b/testsuite/xbt/dynar_string.c index f1d976fb0a..44090239de 100644 --- a/testsuite/xbt/dynar_string.c +++ b/testsuite/xbt/dynar_string.c @@ -2,11 +2,10 @@ /* dynar_string: A test case for the dynar using strings as content */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/heap_bench.c b/testsuite/xbt/heap_bench.c index fe6866e76b..84abc4f885 100644 --- a/testsuite/xbt/heap_bench.c +++ b/testsuite/xbt/heap_bench.c @@ -1,9 +1,12 @@ +/* $Id$ */ + /* A few tests for the xbt_heap module */ -/* Authors: Arnaud Legrand */ +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include #include diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c index d8192e05f4..d3beea3f0c 100644 --- a/testsuite/xbt/log_usage.c +++ b/testsuite/xbt/log_usage.c @@ -2,11 +2,10 @@ /* log_usage - A test of normal usage of the log facilities */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/multidict_crash.c b/testsuite/xbt/multidict_crash.c index 2e8a92d969..1799a11f37 100644 --- a/testsuite/xbt/multidict_crash.c +++ b/testsuite/xbt/multidict_crash.c @@ -2,11 +2,10 @@ /* multidict_crash - A crash test for multi-level dictionnaries */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/set_usage.c b/testsuite/xbt/set_usage.c index e31de7bf3a..b5102661e4 100644 --- a/testsuite/xbt/set_usage.c +++ b/testsuite/xbt/set_usage.c @@ -2,11 +2,10 @@ /* set_usage - A test of normal usage of a set */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include diff --git a/testsuite/xbt/swag_usage.c b/testsuite/xbt/swag_usage.c index 0bf9ada636..96279ccc95 100644 --- a/testsuite/xbt/swag_usage.c +++ b/testsuite/xbt/swag_usage.c @@ -1,3 +1,12 @@ +/* $Id$ */ + +/* A simple example to demonstrate the use of swags */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include #include #include "xbt/swag.h"