Changeset 33218c6 for tools


Ignore:
Timestamp:
Jul 26, 2017, 12:19:41 PM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
b947fb2
Parents:
e0a653d (diff), ea91c42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
tools
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • tools/cfa.nanorc

    re0a653d r33218c6  
    88
    99# Types
    10 color green "\<(forall|otype|dtype|ftype|trait|mutex|_Bool|volatile)\>"
     10color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
    1111color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto)\>"
    1212color green "\<(static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
     
    1414
    1515# Declarations
    16 color brightgreen "\<(struct|union|typedef|trait|coroutine|monitor)\>"
     16color brightgreen "\<(struct|union|typedef|trait|coroutine|monitor|thread)\>"
     17color brightgreen "\<(with)\>"
    1718
    1819# Control Flow Structures
  • tools/prettyprinter/ParserTypes.h

    re0a653d r33218c6  
    1313// Created On       : Sun Dec 16 15:00:49 2001
    1414// Last Modified By : Peter A. Buhr
    15 // Last Modified On : Wed Jun 28 22:59:27 2017
    16 // Update Count     : 174
     15// Last Modified On : Sat Jul 22 10:13:09 2017
     16// Update Count     : 175
    1717//
    1818
    19 #ifndef __PARSER_HH__
    20 #define __PARSER_HH__
     19#pragma once
    2120
    2221int yylex();
     
    2625#include "token.h"
    2726
    28 #endif // __PARSER_HH__
    29 
    3027// Local Variables: //
    3128// mode: c++ //
  • tools/prettyprinter/filter.h

    re0a653d r33218c6  
    1010// Created On       : Tue Apr  9 22:31:18 2002
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun 29 08:28:32 2017
    13 // Update Count     : 10
     12// Last Modified On : Sat Jul 22 10:12:55 2017
     13// Update Count     : 11
    1414//
    1515
    16 #ifndef __FILTER_H__
    17 #define __FILTER_H__
     16#pragma once
    1817
    1918#include "ParserTypes.h"
     
    2827void HTML( Token * tree );
    2928
    30 #endif // __FILTER_H__
    31 
    3229// Local Variables: //
    3330// mode: c++ //
  • tools/prettyprinter/lex.ll

    re0a653d r33218c6  
    1 /*                               -*- Mode: C -*-
    2  *
     1/*
    32 * Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
    43 *
     
    1110 * Created On       : Sat Dec 15 11:45:59 2001
    1211 * Last Modified By : Peter A. Buhr
    13  * Last Modified On : Wed Jun 28 22:57:17 2017
    14  * Update Count     : 253
     12 * Last Modified On : Fri Jul 21 23:06:16 2017
     13 * Update Count     : 254
    1514 */
    1615
  • tools/prettyprinter/test.y

    re0a653d r33218c6  
    1515        ;
    1616
    17 rules1  : /* empty */
     17rules1  :
     18        /* empty */
     19        {}
    1820        | xxx
    1921          /* fred */ yyy
  • tools/prettyprinter/token.cc

    re0a653d r33218c6  
    1 //                              -*- Mode: C++ -*-
    21//
    3 // Copyright (C) Peter A. Buhr 2017
     2// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
    46//
    57// Pretty Printer, Copyright (C) Richard C. Bilson and Rodolfo G. Esteves 2001
     
    1012// Created On       : Wed Jun 28 22:46:23 2017
    1113// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun 29 09:33:49 2017
    13 // Update Count     : 9
     14// Last Modified On : Fri Jul 21 23:07:04 2017
     15// Update Count     : 10
    1416//
    1517
  • tools/prettyprinter/token.h

    re0a653d r33218c6  
    1010// Created On       : Wed Jun 28 22:47:58 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Jun 28 23:02:06 2017
    13 // Update Count     : 5
     12// Last Modified On : Sat Jul 22 10:12:42 2017
     13// Update Count     : 6
    1414//
    1515
    16 #ifndef __TOKEN_H__
    17 #define __TOKEN_H__
     16#pragma once
    1817
    1918struct Token {
     
    3534};
    3635
    37 #endif // __TOKEN_H__
    38 
    3936// Local Variables: //
    4037// tab-width: 4 //
Note: See TracChangeset for help on using the changeset viewer.