Changeset 1041 for trunk

Show
Ignore:
Timestamp:
02/07/08 21:11:19 (8 months ago)
Author:
otter
Message:

Added 'annotation(Library="ModelicaExternalC")' to all 'external "C"' functions, as decided at the last design meeting.

Location:
trunk/Modelica
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/Modelica/Blocks/Sources.mo

    r1013 r1041  
    11within Modelica.Blocks; 
     2 
    23 
    34package Sources 
    … …  
    25322533      "Maximum abscissa value defined in table"; 
    25332534 
    2534  
    25352535    annotation ( 
    25362536      Documentation(info="<HTML> 
    … …  
    27982798                   tableName, fileName, table, size(table, 1), size(table, 2), 
    27992799                   startTime, smoothness, extrapolation); 
     2800      annotation(Library="ModelicaExternalC"); 
    28002801    end tableTimeInit; 
    28012802 
    … …  
    28072808    external "C" value =  
    28082809                       ModelicaTables_CombiTimeTable_interpolate(tableID, icol, timeIn); 
     2810      annotation(Library="ModelicaExternalC"); 
    28092811    end tableTimeIpo; 
    28102812 
    … …  
    28142816    external "C" Tmin =  
    28152817                      ModelicaTables_CombiTimeTable_minimumTime(tableID); 
     2818      annotation(Library="ModelicaExternalC"); 
    28162819    end tableTimeTmin; 
    28172820 
    … …  
    28212824    external "C" Tmax =  
    28222825                      ModelicaTables_CombiTimeTable_maximumTime(tableID); 
     2826      annotation(Library="ModelicaExternalC"); 
    28232827    end tableTimeTmax; 
    28242828 

  • trunk/Modelica/Blocks/Tables.mo

    r1013 r1041  
    220220                   tableName, fileName, table, size(table, 1), size(table, 2), 
    221221                   smoothness); 
     222      annotation(Library="ModelicaExternalC"); 
    222223    end tableInit; 
    223224 
    … …  
    229230    external "C" value =  
    230231                       ModelicaTables_CombiTable1D_interpolate(tableID, icol, u); 
     232      annotation(Library="ModelicaExternalC"); 
    231233    end tableIpo; 
    232234  equation 
    … …  
    464466                   tableName, fileName, table, size(table, 1), size(table, 2), 
    465467                   smoothness); 
     468      annotation(Library="ModelicaExternalC"); 
    466469    end tableInit; 
    467470 
    … …  
    473476    external "C" value =  
    474477                       ModelicaTables_CombiTable1D_interpolate(tableID, icol, u); 
     478      annotation(Library="ModelicaExternalC"); 
    475479    end tableIpo; 
    476480 
    … …  
    732736                   tableName, fileName, table, size(table, 1), size(table, 2), 
    733737                   smoothness); 
     738      annotation(Library="ModelicaExternalC"); 
    734739    end tableInit; 
    735740 
    … …  
    741746    external "C" value =  
    742747                       ModelicaTables_CombiTable2D_interpolate(tableID, u1, u2); 
     748      annotation(Library="ModelicaExternalC"); 
    743749    end tableIpo; 
    744750 

  • trunk/Modelica/Math/package.mo

    r1008 r1041  
    40064006</html>")); 
    40074007external "C" y = sin(u); 
     4008annotation(Library="ModelicaExternalC"); 
    40084009end sin; 
    40094010 
    … …  
    40894090</html>")); 
    40904091external "C" y = cos(u); 
     4092annotation(Library="ModelicaExternalC"); 
    40914093end cos; 
    40924094 
    … …  
    41754177</html>")); 
    41764178external "C" y = tan(u); 
     4179annotation(Library="ModelicaExternalC"); 
    41774180end tan; 
    41784181 
    … …  
    42624265</html>")); 
    42634266external "C" y = asin(u); 
     4267annotation(Library="ModelicaExternalC"); 
    42644268end asin; 
    42654269 
    … …  
    43454349</html>")); 
    43464350external "C" y = acos(u); 
     4351annotation(Library="ModelicaExternalC"); 
    43474352end acos; 
    43484353 
    … …  
    44224427</html>")); 
    44234428external "C" y = atan(u); 
     4429annotation(Library="ModelicaExternalC"); 
    44244430end atan; 
    44254431 
    … …  
    45304536")); 
    45314537external "C" y = atan2(u1, u2); 
     4538annotation(Library="ModelicaExternalC"); 
    45324539end atan2; 
    45334540 
    … …  
    47314738</html>")); 
    47324739external "C" y = sinh(u); 
     4740annotation(Library="ModelicaExternalC"); 
    47334741end sinh; 
    47344742 
    … …  
    48204828</html>")); 
    48214829external "C" y = cosh(u); 
     4830annotation(Library="ModelicaExternalC"); 
    48224831end cosh; 
    48234832 
    … …  
    48974906</html>")); 
    48984907external "C" y = tanh(u); 
     4908annotation(Library="ModelicaExternalC"); 
    48994909end tanh; 
    49004910 
    … …  
    51785188</html>")); 
    51795189external "C" y = exp(u); 
     5190annotation(Library="ModelicaExternalC"); 
    51805191end exp; 
    51815192 
    … …  
    52685279 
    52695280external "C" y = log(u); 
     5281annotation(Library="ModelicaExternalC"); 
    52705282end log; 
    52715283 
    … …  
    53585370 
    53595371external "C" y = log10(u); 
     5372annotation(Library="ModelicaExternalC"); 
    53605373end log10; 
    53615374 

  • trunk/Modelica/Utilities/Files.mo

    r940 r1041  
    602602  output String fullName "Full path of 'name'"; 
    603603external "C" fullName = ModelicaInternal_fullPathName(name); 
    604   annotation (Documentation(info="<html> 
     604  annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    605605<h4>Syntax</h4> 
    606606<blockquote><pre> 
    … …  
    690690  output String fileName "Full path name of temporary file"; 
    691691  external "C" fileName=ModelicaInternal_temporaryFileName(0); 
    692   annotation (Documentation(info="<html> 
     692  annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    693693<h4>Syntax</h4> 
    694694<blockquote><pre> 

  • trunk/Modelica/Utilities/Streams.mo

    r887 r1041  
    7979                        caption="Text file to store the output of print(..)"))); 
    8080  external "C" ModelicaInternal_print(string, fileName); 
    81     annotation ( 
     81    annotation (Library="ModelicaExternalC", 
    8282  Documentation(info="<HTML> 
    8383<h4>Syntax</h4> 
    … …  
    151151      "If true, end-of-file was reached when trying to read line"; 
    152152   external "C" string=  ModelicaInternal_readLine(fileName,lineNumber,endOfFile); 
    153     annotation (Documentation(info="<html> 
     153    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    154154<h4>Syntax</h4> 
    155155<blockquote><pre> 
    … …  
    179179    output Integer numberOfLines "Number of lines in file"; 
    180180  external "C" numberOfLines=  ModelicaInternal_countLines(fileName); 
    181     annotation (Documentation(info="<html> 
     181    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    182182<h4>Syntax</h4> 
    183183<blockquote><pre> 
    … …  
    197197    input String string "String to be printed to error message window"; 
    198198    external "C" ModelicaError(string); 
    199     annotation ( 
     199    annotation (Library="ModelicaExternalC", 
    200200  Documentation(info="<html> 
    201201<h4>Syntax</h4> 
    … …  
    228228                        caption="Close text file"))); 
    229229    external "C" ModelicaStreams_closeFile(fileName); 
    230     annotation (Documentation(info="<html> 
     230    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    231231<h4>Syntax</h4> 
    232232<blockquote><pre> 

  • trunk/Modelica/Utilities/Strings.mo

    r887 r1041  
    66    output Integer result "Number of characters of string"; 
    77  external "C" result=  ModelicaStrings_length(string); 
    8     annotation ( Documentation(info="<html> 
     8    annotation (Library="ModelicaExternalC", Documentation(info="<html> 
    99<h4>Syntax</h4> 
    1010<blockquote><pre> 
    … …  
    2929  external "C" result =  
    3030                      ModelicaStrings_substring(string,startIndex,endIndex); 
    31     annotation ( 
     31    annotation (Library="ModelicaExternalC", 
    3232  Documentation(info="<html> 
    3333<h4>Syntax</h4> 
    … …  
    8888    output Modelica.Utilities.Types.Compare result "Result of comparison"; 
    8989  external "C" result=  ModelicaStrings_compare(string1, string2, caseSensitive); 
    90     annotation ( Documentation(info="<html> 
     90    annotation (Library="ModelicaExternalC", Documentation(info="<html> 
    9191<h4>Syntax</h4> 
    9292<blockquote><pre> 
    … …  
    10831083      output Real number "Value of Real number"; 
    10841084      external "C" ModelicaStrings_scanReal(string, startIndex, unsigned, nextIndex, number); 
    1085       annotation (Documentation(info="<html> 
     1085      annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    10861086<h4>Syntax</h4> 
    10871087<blockquote><pre> 
    … …  
    11311131      output Integer number "Value of Integer number"; 
    11321132      external "C" ModelicaStrings_scanInteger(string, startIndex, unsigned, nextIndex, number); 
    1133       annotation (Documentation(info="<html> 
     1133      annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    11341134<h4>Syntax</h4> 
    11351135<blockquote><pre> 
    … …  
    11761176      output String string2 "Value of String token"; 
    11771177      external "C" ModelicaStrings_scanString(string, startIndex, nextIndex, string2); 
    1178       annotation (Documentation(info="<html> 
     1178      annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    11791179<h4>Syntax</h4> 
    11801180<blockquote><pre> 
    … …  
    12121212      external "C" ModelicaStrings_scanIdentifier(string, startIndex, nextIndex, identifier); 
    12131213 
    1214       annotation (Documentation(info="<html> 
     1214      annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    12151215<h4>Syntax</h4> 
    12161216<blockquote><pre> 
    … …  
    12461246      output Integer nextIndex; 
    12471247      external "C" nextIndex = ModelicaStrings_skipWhiteSpace(string, startIndex); 
    1248       annotation (Documentation(info="<html> 
     1248      annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    12491249<h4>Syntax</h4> 
    12501250<blockquote><pre> 

  • trunk/Modelica/Utilities/System.mo

    r887 r1041  
    2222// POSIX function "getcwd" 
    2323  external "C" directory = ModelicaInternal_getcwd(0); 
    24     annotation (Documentation(info="<html> 
     24    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    2525  
    2626</html>")); 
    … …  
    3232// POSIX function "chdir" 
    3333external "C" ModelicaInternal_chdir(directory); 
    34     annotation (Documentation(info="<html> 
     34    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    3535   
    3636</html>")); 
    … …  
    4747      "= true, if environment variable exists; = false, if it does not exist"; 
    4848  external "C" ModelicaInternal_getenv(name, convertToSlash, content, exist); 
    49     annotation (Documentation(info="<html> 
     49    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    5050   
    5151</html>")); 
    … …  
    5959      "True, if '/' in content shall be changed to the native directory separator"; 
    6060external "C" ModelicaInternal_setenv(name, content, convertFromSlash); 
    61     annotation (Documentation(info="<html> 
     61    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    6262     
    6363</html>")); 
    … …  
    6969  output Integer result "Return value from command (depends on environment)"; 
    7070  external "C" result = system(string); 
    71     annotation (Documentation(info="<html> 
     71    annotation (Library="ModelicaExternalC",Documentation(info="<html> 
    7272  
    7373</html>")); 
    … …  
    7979      "Result to be returned by environment (0 means success)"; 
    8080  external "C" ModelicaInternal_exit(status); 
     81  annotation(Library="ModelicaExternalC"); 
    8182end exit; 
    8283end System; 

  • trunk/Modelica/Utilities/package.mo

    r940 r1041  
    242242    input String directoryName "Make a new directory"; 
    243243  external "C" ModelicaInternal_mkdir(directoryName); 
     244  annotation(Library="ModelicaExternalC"); 
    244245  end mkdir; 
    245246 
    … …  
    248249    input String directoryName "Empty directory to be removed"; 
    249250  external "C" ModelicaInternal_rmdir(directoryName); 
     251  annotation(Library="ModelicaExternalC"); 
    250252  end rmdir; 
    251253 
    … …  
    255257    output Types.FileType fileType "Type of file"; 
    256258  external "C" fileType=  ModelicaInternal_stat(name); 
     259  annotation(Library="ModelicaExternalC"); 
    257260  end stat; 
    258261 
    … …  
    262265    input String newName "New name"; 
    263266  external "C" ModelicaInternal_rename(oldName, newName); 
     267  annotation(Library="ModelicaExternalC"); 
    264268  end rename; 
    265269 
    … …  
    268272    input String fileName "File to be removed"; 
    269273  external "C" ModelicaInternal_removeFile(fileName); 
     274  annotation(Library="ModelicaExternalC"); 
    270275  end removeFile; 
    271276 
    … …  
    276281    input String toName "Name of copy of file"; 
    277282  external "C" ModelicaInternal_copyFile(fromName, toName); 
     283  annotation(Library="ModelicaExternalC"); 
    278284  end copyFile; 
    279285 
    … …  
    288294      "All file and directory names in any order from the desired directory"; 
    289295    external "C" ModelicaInternal_readDirectory(directory,nNames,names); 
     296  annotation(Library="ModelicaExternalC"); 
    290297  end readDirectory; 
    291298 
    … …  
    297304      "Number of files and directories present in 'directory'"; 
    298305  external "C" result = ModelicaInternal_getNumberOfFiles(directory); 
     306  annotation(Library="ModelicaExternalC"); 
    299307end getNumberOfFiles; 
    300308