Changeset 6d7c3df

Ignore:
Timestamp:
Oct 26, 2016, 5:49:40 PM (5 years ago)
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
03d416f, 25f49f4, 47a8d17
Parents:
1b29996 (diff), fe7b281 (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 plg2:software/cfa/cfa-cc

Location:
doc
Files:
1 added
4 edited

Unmodified
Added
Removed
• doc/LaTeXmacros/common.tex

 r1b29996 % CFA programming language, based on ANSI C (with some gcc additions) \lstdefinelanguage{Pseudo}{ morekeywords={string,uint,int,bool,float},% sensitive=true,% morecomment=[l]{//},% morecomment=[s]{/*}{*/},% morestring=[b]',% morestring=[b]",% morestring=[s]{}{},% }% \lstset{ language=Pseudo, columns=fullflexible, basicstyle=\linespread{0.9}\tt\small,           % reduce line spacing and use typewriter font stringstyle=\sf\color{Mahogany},                        % use sanserif font commentstyle=\itshape\color{OliveGreen},                % green and italic comments tabsize=4,                                                      % 4 space tabbing xleftmargin=\parindentlnth,                             % indent code to paragraph indentation extendedchars=true,                                     % allow ASCII characters in the range 128-255 escapechar=§,                                           % escape to latex in CFA code mathescape=true,                                                % allow $...$ LaTeX math escapes in code %keepspaces=true,                                               % showstringspaces=false,                                 % do not show spaces with cup showlines=true,                                         % show blank lines at end of code aboveskip=4pt,                                          % spacing above/below code block belowskip=3pt, moredelim=**[is][\color{red}]{®}{®},    % red highlighting moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords % replace/adjust listing characters that look bad in sanserif literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {Â©}{{\"u}}1 {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {}{\ttfamily\upshape\hspace*{-0.1ex}}1 {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2, }% % CFA programming language, based on ANSI C (with some gcc additions) \lstdefinelanguage{CFA}[ANSI]{C}{ morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto, \lstMakeShortInline©    % single-character for \lstinline \let\Oldthebibliography\thebibliography \renewcommand\thebibliography[1]{
• doc/proposals/concurrency/concurrency.tex

• doc/proposals/concurrency/ext_monitor.fig

 r1b29996 -2 1200 2 6 1275 1200 1575 1500 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 1425 1350 105 105 1425 1350 1530 1350 4 1 -1 0 0 0 10 0.0000 2 105 90 1425 1410 b\001 -6 6 1275 1500 1575 1800 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 1425 1650 105 105 1425 1650 1530 1650 4 1 -1 0 0 0 10 0.0000 2 75 75 1425 1695 a\001 -6 6 2175 1500 2475 1800 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 2325 1650 105 105 2325 1650 2430 1650 4 1 -1 0 0 0 10 0.0000 2 75 75 2325 1695 c\001 -6 6 2175 1200 2475 1500 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 2325 1350 105 105 2325 1350 2430 1350 4 1 -1 0 0 0 10 0.0000 2 105 90 2325 1410 d\001 -6 6 2775 1200 7350 5700 5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 3450.000 3150 3150 2850 3450 3150 3750 5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 4350.000 3150 4050 2850 4350 3150 4650 4 1 -1 0 0 0 10 0.0000 2 105 90 6000 1860 b\001 -6 6 3000 5400 6975 5700 6 5100 1800 5400 2100 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 1950 105 105 5250 1950 5355 1950 4 1 -1 0 0 0 10 0.0000 2 105 120 5250 2010 Y\001 -6 6 5100 2100 5400 2400 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 2250 105 105 5250 2250 5355 2250 4 1 -1 0 0 0 10 0.0000 2 105 120 5250 2295 X\001 -6 6 3000 5400 7200 5700 1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 5550 80 80 3150 5550 3230 5630 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4500 5550 105 105 4500 5550 4605 5655 1 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6000 5550 105 105 6000 5550 6105 5655 4 0 -1 0 0 0 12 0.0000 2 180 765 6225 5625 duplicate\001 4 0 -1 0 0 0 12 0.0000 2 135 1035 4725 5625 blocked task\001 4 0 -1 0 0 0 12 0.0000 2 135 870 3300 5625 active task\001 4 0 -1 0 0 0 12 0.0000 2 180 930 6225 5625 routine ptrs\001 -6 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 3300 3600 105 105 3300 3600 3405 3705 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2400 105 105 6000 2400 6105 2505 1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 5100 4575 80 80 5100 4575 5180 4655 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 4050 2925 5475 2925 5475 3225 4050 3225 4050 2925 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2 5850 2850 6075 3000 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4 3150 3150 3750 3150 3750 2850 5325 2850 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2 1 1 1.00 60.00 120.00 7 1 1.00 60.00 120.00 5250 3150 5250 2400 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 5100 1800 5400 1800 5400 2400 5100 2400 5100 1800 4 1 -1 0 0 0 10 0.0000 2 75 75 6000 2745 a\001 4 1 -1 0 0 0 10 0.0000 2 75 75 6000 2445 c\001 4 1 -1 0 0 0 12 0.0000 2 135 525 5100 3675 shared\001 4 1 -1 0 0 0 12 0.0000 2 135 735 5100 3975 variables\001 -6 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2 1275 1800 1500 1950 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2 2175 1800 2400 1950 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4 1575 1200 1575 1800 2175 1800 2175 1200 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4 1275 1200 1275 2100 2475 2100 2475 1200 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 4050 2925 5475 2925 5475 3225 4050 3225 4050 2925 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 1 1 1.00 60.00 120.00 1875 2400 1875 2175 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 1 2 7 1 1.00 60.00 120.00 5250 3075 5250 2400 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 5250 2400 1875 2400 4 1 -1 0 0 0 12 0.0000 2 135 135 2325 1125 Y\001 4 1 -1 0 0 0 12 0.0000 2 120 510 1875 675 mutex\001 4 1 -1 0 0 0 12 0.0000 2 135 570 1875 900 queues\001 4 1 -1 0 0 0 12 0.0000 2 135 135 1425 1125 X\001 4 0 0 50 -1 0 11 0.0000 2 150 795 4275 3150 Queues Ptr\001 4 0 0 50 -1 0 11 0.0000 2 165 855 4275 3150 Acceptables\001
• doc/proposals/concurrency/version

 r1b29996 0.4.61 0.4.95
Note: See TracChangeset for help on using the changeset viewer.